The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 17:15 UTC
fix(web): terminal "Add to chat" now adds to a queued message being edited (#36117)
Julius Marminge committed
Nov 13, 2026 at 02:20 UTC
ed7e5010baafd73d0164ee1d5adbd21e26f8f9cb
3 files changed
+51
-10
apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
+27
@@ -18,6 +18,7 @@ import { toastManager } from "../ui/toast";
18
import { act, render } from "../../../test/render";
19
import { useComposerDraftStore, useComposerThreadDraft } from "../../composerDraftStore";
20
import { formatInlineContextReference } from "../../lib/composerContextReferences";
21
+import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "../../lib/terminalContext";
22
import {
23
environmentContextRecord,
24
environmentContextReference,
@@ -327,6 +328,32 @@ describe("useQueuedRunEdit", () => {
328
);
329
});
330
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
+
357
it("keeps an open edit when the user leaves the thread and comes back", async () => {
358
const { hook } = setup();
359
await using screen = await render(view(THREAD_A, "queued", hook));
apps/web/src/components/chat/useQueuedRunEdit.ts
+5
-9
@@ -28,7 +28,7 @@ import { Atom } from "effect/reactivity";
28
import type { RefObject } from "react";
29
import { useAssetUrls } from "../../assets/assetUrls";
30
import {
31
- DraftId,
31
+ queuedRunEditDraftId,
32
useComposerDraftStore,
33
type ComposerFileAttachment,
34
type ComposerImageAttachment,
@@ -95,10 +95,6 @@ interface QueuedRunEditContent {
95
const isDraftOwnedRecord = (record: ComposerContextRecord) =>
96
record.kind === "thread" || record.kind === "environment";
97
98
-function queuedEditDraftTarget(routeThreadRef: ScopedThreadRef, runId: RunId) {
99
- return DraftId.make(`queued-edit:${scopedThreadKey(routeThreadRef)}:${runId}`);
100
-}
101
-
98
async function submitQueuedRunEdit(input: {
99
readonly environmentId: EnvironmentId;
100
readonly draftTarget: ComposerThreadTarget;
@@ -216,7 +212,7 @@ export function useQueuedRunEdit(input: {
212
const editing = activeThreadId === null ? null : storedEdit;
213
const isSaving = useAtomValue(queuedRunEdits.savingAtom)[editKey] === true;
214
const draftTarget =
219
- editing === null ? threadDraftTarget : queuedEditDraftTarget(routeThreadRef, editing.runId);
215
+ editing === null ? threadDraftTarget : queuedRunEditDraftId(routeThreadRef, editing.runId);
216
217
const imageResources = (editing?.existingAttachments ?? [])
218
.filter((attachment) => attachment.type === "image")
@@ -239,12 +235,12 @@ export function useQueuedRunEdit(input: {
235
const clearEditDraft = (runId: RunId) =>
236
useComposerDraftStore
237
.getState()
242
- .clearComposerContent(queuedEditDraftTarget(routeThreadRef, runId));
238
+ .clearComposerContent(queuedRunEditDraftId(routeThreadRef, runId));
239
240
const beginEdit = useStableCallback((request: EditQueuedRunRequest) => {
241
if (activeThreadId === null) return;
242
if (editing !== null && editing.runId !== request.runId) clearEditDraft(editing.runId);
247
- const target = queuedEditDraftTarget(routeThreadRef, request.runId);
243
+ const target = queuedRunEditDraftId(routeThreadRef, request.runId);
244
const sentText = stripAttachmentOnlyBootstrapPrompt(request.text);
245
const context = serverProjection?.messages.find(
246
(message) => message.id === request.messageId,
@@ -294,7 +290,7 @@ export function useQueuedRunEdit(input: {
290
// unscoped and names the thread: the user may be anywhere by now.
291
onRunLeftQueue: (_, edit) => {
292
const recovery = recoverQueuedMessageEdit({
297
- editTarget: queuedEditDraftTarget(routeThreadRef, edit.runId),
293
+ editTarget: queuedRunEditDraftId(routeThreadRef, edit.runId),
294
threadTarget: threadDraftTarget,
295
originalText: edit.originalText,
296
removedExistingAttachment: edit.removedExistingAttachment === true,
apps/web/src/composerDraftStore.ts
+19
-1
@@ -1545,6 +1545,21 @@ export function resolveComposerDraftKey(
1545
return threadKey.length > 0 ? threadKey : null;
1546
}
1547
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
+
1563
function resolveComposerThreadId(
1564
state: ComposerThreadLookupState,
1565
target: ComposerThreadTarget,
@@ -1556,7 +1571,10 @@ function resolveComposerThreadId(
1571
if (typeof normalizedTarget !== "string") {
1572
return normalizedTarget.threadId;
1573
}
1559
- return state.draftThreadsByThreadKey[normalizedTarget]?.threadId ?? null;
1574
+ return (
1575
+ state.draftThreadsByThreadKey[normalizedTarget]?.threadId ??
1576
+ queuedRunEditThreadId(normalizedTarget)
1577
+ );
1578
}
1579
1580
function getComposerDraftState(