Skip to content

Commit ed7e501

Browse files
fix(web): terminal "Add to chat" now adds to a queued message being edited (#36117)
1 parent 21b0b7a commit ed7e501

3 files changed

Lines changed: 51 additions & 10 deletions

File tree

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { toastManager } from "../ui/toast";
1818
import { act, render } from "../../../test/render";
1919
import { useComposerDraftStore, useComposerThreadDraft } from "../../composerDraftStore";
2020
import { formatInlineContextReference } from "../../lib/composerContextReferences";
21+
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "../../lib/terminalContext";
2122
import {
2223
environmentContextRecord,
2324
environmentContextReference,
@@ -327,6 +328,32 @@ describe("useQueuedRunEdit", () => {
327328
);
328329
});
329330

331+
it("adds terminal context to the queued message being edited", async () => {
332+
const { hook } = setup();
333+
await using _screen = await render(view(THREAD_A, "queued", hook));
334+
await beginChangedEdit(hook);
335+
const target = requireHook(hook).draftTarget;
336+
const inserted = useComposerDraftStore.getState().insertTerminalContext(
337+
target,
338+
`changed${INLINE_TERMINAL_CONTEXT_PLACEHOLDER}`,
339+
{
340+
id: "terminal-context-1",
341+
threadId: THREAD_A.threadId,
342+
createdAt: "2026-01-01T00:00:00.000Z",
343+
terminalId: "default",
344+
terminalLabel: "Terminal 1",
345+
lineStart: 3,
346+
lineEnd: 3,
347+
text: "hello",
348+
},
349+
0,
350+
);
351+
expect(inserted).toBe(true);
352+
expect(
353+
useComposerDraftStore.getState().getComposerDraft(target)?.terminalContexts,
354+
).toHaveLength(1);
355+
});
356+
330357
it("keeps an open edit when the user leaves the thread and comes back", async () => {
331358
const { hook } = setup();
332359
await using screen = await render(view(THREAD_A, "queued", hook));

‎apps/web/src/components/chat/useQueuedRunEdit.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Atom } from "effect/reactivity";
2828
import type { RefObject } from "react";
2929
import { useAssetUrls } from "../../assets/assetUrls";
3030
import {
31-
DraftId,
31+
queuedRunEditDraftId,
3232
useComposerDraftStore,
3333
type ComposerFileAttachment,
3434
type ComposerImageAttachment,
@@ -95,10 +95,6 @@ interface QueuedRunEditContent {
9595
const isDraftOwnedRecord = (record: ComposerContextRecord) =>
9696
record.kind === "thread" || record.kind === "environment";
9797

98-
function queuedEditDraftTarget(routeThreadRef: ScopedThreadRef, runId: RunId) {
99-
return DraftId.make(`queued-edit:${scopedThreadKey(routeThreadRef)}:${runId}`);
100-
}
101-
10298
async function submitQueuedRunEdit(input: {
10399
readonly environmentId: EnvironmentId;
104100
readonly draftTarget: ComposerThreadTarget;
@@ -216,7 +212,7 @@ export function useQueuedRunEdit(input: {
216212
const editing = activeThreadId === null ? null : storedEdit;
217213
const isSaving = useAtomValue(queuedRunEdits.savingAtom)[editKey] === true;
218214
const draftTarget =
219-
editing === null ? threadDraftTarget : queuedEditDraftTarget(routeThreadRef, editing.runId);
215+
editing === null ? threadDraftTarget : queuedRunEditDraftId(routeThreadRef, editing.runId);
220216

221217
const imageResources = (editing?.existingAttachments ?? [])
222218
.filter((attachment) => attachment.type === "image")
@@ -239,12 +235,12 @@ export function useQueuedRunEdit(input: {
239235
const clearEditDraft = (runId: RunId) =>
240236
useComposerDraftStore
241237
.getState()
242-
.clearComposerContent(queuedEditDraftTarget(routeThreadRef, runId));
238+
.clearComposerContent(queuedRunEditDraftId(routeThreadRef, runId));
243239

244240
const beginEdit = useStableCallback((request: EditQueuedRunRequest) => {
245241
if (activeThreadId === null) return;
246242
if (editing !== null && editing.runId !== request.runId) clearEditDraft(editing.runId);
247-
const target = queuedEditDraftTarget(routeThreadRef, request.runId);
243+
const target = queuedRunEditDraftId(routeThreadRef, request.runId);
248244
const sentText = stripAttachmentOnlyBootstrapPrompt(request.text);
249245
const context = serverProjection?.messages.find(
250246
(message) => message.id === request.messageId,
@@ -294,7 +290,7 @@ export function useQueuedRunEdit(input: {
294290
// unscoped and names the thread: the user may be anywhere by now.
295291
onRunLeftQueue: (_, edit) => {
296292
const recovery = recoverQueuedMessageEdit({
297-
editTarget: queuedEditDraftTarget(routeThreadRef, edit.runId),
293+
editTarget: queuedRunEditDraftId(routeThreadRef, edit.runId),
298294
threadTarget: threadDraftTarget,
299295
originalText: edit.originalText,
300296
removedExistingAttachment: edit.removedExistingAttachment === true,

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1545,6 +1545,21 @@ export function resolveComposerDraftKey(
15451545
return threadKey.length > 0 ? threadKey : null;
15461546
}
15471547

1548+
const QUEUED_RUN_EDIT_DRAFT_PREFIX = "queued-edit:";
1549+
1550+
// Thread and run ids both contain colons, so the run id is encoded to keep the thread key parseable.
1551+
export function queuedRunEditDraftId(threadRef: ScopedThreadRef, runId: string): DraftId {
1552+
return DraftId.make(
1553+
`${QUEUED_RUN_EDIT_DRAFT_PREFIX}${scopedThreadKey(threadRef)}:${encodeURIComponent(runId)}`,
1554+
);
1555+
}
1556+
1557+
function queuedRunEditThreadId(draftId: string): ThreadId | null {
1558+
if (!draftId.startsWith(QUEUED_RUN_EDIT_DRAFT_PREFIX)) return null;
1559+
const rest = draftId.slice(QUEUED_RUN_EDIT_DRAFT_PREFIX.length);
1560+
return parseScopedThreadKey(rest.slice(0, rest.lastIndexOf(":")))?.threadId ?? null;
1561+
}
1562+
15481563
function resolveComposerThreadId(
15491564
state: ComposerThreadLookupState,
15501565
target: ComposerThreadTarget,
@@ -1556,7 +1571,10 @@ function resolveComposerThreadId(
15561571
if (typeof normalizedTarget !== "string") {
15571572
return normalizedTarget.threadId;
15581573
}
1559-
return state.draftThreadsByThreadKey[normalizedTarget]?.threadId ?? null;
1574+
return (
1575+
state.draftThreadsByThreadKey[normalizedTarget]?.threadId ??
1576+
queuedRunEditThreadId(normalizedTarget)
1577+
);
15601578
}
15611579

15621580
function getComposerDraftState(

0 commit comments

Comments
 (0)