@devries-cameron20 / t3code-1 / commits / 3c8f3f2c3d
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): up-arrow recall keeps thread and machine mentions (#31314)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Carlos Rico-Ospina committed Nov 14, 2026 at 20:49 UTC 3c8f3f2c3d82414b6e710255307fb9ad00d7388e
4 files changed +144 -16
apps/web/src/components/chat/ChatComposer.tsx
+2
@@ -2346,6 +2346,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2346 composerMenuItemsRef,
2347 activeComposerMenuItemRef,
2348 setComposerDraftPrompt,
2349 + setComposerDraftThreadContexts,
2350 + setComposerDraftEnvironmentContexts,
2351 setComposerCursor,
2352 setComposerTrigger,
2353 setComposerHighlightedItemId,
apps/web/src/components/chat/composerCommandKey.ts
+23 -3
@@ -6,6 +6,7 @@ import {
6 } from "@t3tools/client-runtime/state/composer-dispatch";
7 import { type ComposerPromptEditorHandle } from "../ComposerPromptEditorTiptap";
8 import {
9 + type ComposerPromptHistoryMentions,
10 type ComposerPromptHistoryPosition,
11 buildComposerPromptHistoryEntries,
12 stepComposerPromptHistory,
@@ -17,7 +18,11 @@ import {
18 composerSubmissionIntentForKey,
19 } from "../../composer-logic";
20 import { type PendingUserInput } from "../../session-logic";
20 -import { type PreviewAnnotationPayload } from "@t3tools/contracts";
21 +import {
22 + type EnvironmentContextRecord,
23 + type PreviewAnnotationPayload,
24 + type ThreadContextRecord,
25 +} from "@t3tools/contracts";
26 import { type ReviewCommentContext } from "../../reviewCommentContext";
27 import { composerTargetKey } from "../../composerDraftStore";
28 import {
@@ -63,6 +68,14 @@ export function composerCommandKeyHandler(input: {
68 target: ChatComposerProps["composerDraftTarget"],
69 prompt: string,
70 ) => void;
71 + readonly setComposerDraftThreadContexts: (
72 + target: ChatComposerProps["composerDraftTarget"],
73 + records: ReadonlyArray<ThreadContextRecord>,
74 + ) => void;
75 + readonly setComposerDraftEnvironmentContexts: (
76 + target: ChatComposerProps["composerDraftTarget"],
77 + records: ReadonlyArray<EnvironmentContextRecord>,
78 + ) => void;
79 readonly setComposerCursor: Dispatch<SetStateAction<number>>;
80 readonly setComposerTrigger: (trigger: ComposerTrigger | null) => void;
81 readonly setComposerHighlightedItemId: Dispatch<SetStateAction<string | null>>;
@@ -110,6 +123,8 @@ export function composerCommandKeyHandler(input: {
123 composerMenuItemsRef,
124 activeComposerMenuItemRef,
125 setComposerDraftPrompt,
126 + setComposerDraftThreadContexts,
127 + setComposerDraftEnvironmentContexts,
128 setComposerCursor,
129 setComposerTrigger,
130 setComposerHighlightedItemId,
@@ -129,9 +144,14 @@ export function composerCommandKeyHandler(input: {
144 // otherwise turn B's own draft into a browsing position.
145 const promptHistoryTargetKey = composerTargetKey(composerDraftTarget);
146
132 - const replacePromptFromHistory = (nextPrompt: string) => {
147 + const replacePromptFromHistory = (
148 + nextPrompt: string,
149 + mentions: ComposerPromptHistoryMentions,
150 + ) => {
151 promptRef.current = nextPrompt;
152 setComposerDraftPrompt(composerDraftTarget, nextPrompt);
153 + setComposerDraftThreadContexts(composerDraftTarget, mentions.threadContexts);
154 + setComposerDraftEnvironmentContexts(composerDraftTarget, mentions.environmentContexts);
155 setComposerCursor(collapseExpandedComposerCursor(nextPrompt, nextPrompt.length));
156 setComposerTrigger(null);
157 setComposerHighlightedItemId(null);
@@ -176,7 +196,7 @@ export function composerCommandKeyHandler(input: {
196 promptHistoryPositionRef.current = step.position
197 ? { targetKey: promptHistoryTargetKey, position: step.position }
198 : null;
179 - replacePromptFromHistory(step.prompt);
199 + replacePromptFromHistory(step.prompt, step.mentions);
200 return true;
201 };
202
apps/web/src/components/chat/composerPromptHistory.test.ts
+55 -5
@@ -1,4 +1,8 @@
1 -import { ScheduledTaskId } from "@t3tools/contracts";
1 +import { EnvironmentId, ScheduledTaskId, ThreadId } from "@t3tools/contracts";
2 +import {
3 + formatComposerContextReference,
4 + threadContextRecord,
5 +} from "@t3tools/shared/composerContextReferences";
6 import { describe, expect, it } from "vite-plus/test";
7
8 import {
@@ -7,6 +11,7 @@ import {
11 stepComposerPromptHistory,
12 type ComposerPromptHistoryPosition,
13 } from "./composerPromptHistory";
14 +import { environmentContextRecord } from "../../lib/composerContextRecords";
15
16 const entries = buildComposerPromptHistoryEntries([
17 { id: "m1", role: "user", text: "first" },
@@ -94,13 +99,51 @@ describe("buildComposerPromptHistoryEntries", () => {
99 { id: "m3", role: "user", text: "other" },
100 { id: "m4", role: "user", text: "same" },
101 ]);
97 - expect(collapsed).toEqual([
102 + expect(collapsed.map(({ id, prompt }) => ({ id, prompt }))).toEqual([
103 { id: "m2", prompt: "same" },
104 { id: "m3", prompt: "other" },
105 { id: "m4", prompt: "same" },
106 ]);
107 });
108
109 + it("keeps thread and machine mentions with the records the draft needs to resolve them", () => {
110 + const environmentId = EnvironmentId.make("env-1");
111 + const thread = threadContextRecord(
112 + { environmentId, threadId: ThreadId.make("thread-1") },
113 + "Correct invoice charge categories",
114 + );
115 + const unmentioned = threadContextRecord(
116 + { environmentId, threadId: ThreadId.make("thread-2") },
117 + "Removed before send",
118 + );
119 + const machine = environmentContextRecord(environmentId, "Build box");
120 + const threadChip = formatComposerContextReference(thread);
121 + const machineChip = formatComposerContextReference(machine);
122 + const [entry] = buildComposerPromptHistoryEntries([
123 + {
124 + id: "m1",
125 + role: "user",
126 + text: `Agent in ${threadChip} finished on ${machineChip}. See [Gone](t3-context://v1/thread/gone) ![shot](t3-context://v1/image/img-1)`,
127 + context: { version: 1, records: [thread, unmentioned, machine] },
128 + },
129 + ]);
130 + expect(entry).toEqual({
131 + id: "m1",
132 + prompt: `Agent in ${threadChip} finished on ${machineChip}. See`,
133 + mentions: { threadContexts: [thread], environmentContexts: [machine] },
134 + });
135 + const recalled = stepComposerPromptHistory({
136 + direction: "backward",
137 + entries: [entry!],
138 + position: null,
139 + currentPrompt: "",
140 + });
141 + expect(recalled?.mentions).toEqual({
142 + threadContexts: [thread],
143 + environmentContexts: [machine],
144 + });
145 + });
146 +
147 it("skips messages sent by automations, agents, and T3 Code", () => {
148 const typed = buildComposerPromptHistoryEntries([
149 { id: "m1", role: "user", text: "typed" },
@@ -113,21 +156,28 @@ describe("buildComposerPromptHistoryEntries", () => {
156 { id: "m3", role: "user", text: "from agent", createdBy: "agent", creationSource: "mcp" },
157 { id: "m4", role: "user", text: "from server", createdBy: "agent", creationSource: "server" },
158 ]);
116 - expect(typed).toEqual([{ id: "m1", prompt: "typed" }]);
159 + expect(typed.map((entry) => entry.id)).toEqual(["m1"]);
160 });
161 });
162
163 describe("stepComposerPromptHistory", () => {
164 it("walks back from the newest entry", () => {
165 const first = backward(null, "");
123 - expect(first).toEqual({ position: { entryId: "m3", recalled: "third" }, prompt: "third" });
166 + expect(first).toMatchObject({
167 + position: { entryId: "m3", recalled: "third" },
168 + prompt: "third",
169 + });
170 expect(backward(first!.position, "third")?.prompt).toBe("second");
171 });
172
173 it("walks forward and empties the composer past the newest entry", () => {
174 const newer = forward({ entryId: "m2", recalled: "second" }, "second");
175 expect(newer?.prompt).toBe("third");
130 - expect(forward(newer!.position, "third")).toEqual({ position: null, prompt: "" });
176 + expect(forward(newer!.position, "third")).toEqual({
177 + position: null,
178 + prompt: "",
179 + mentions: { threadContexts: [], environmentContexts: [] },
180 + });
181 });
182
183 it("treats an edited recall as a fresh draft", () => {
apps/web/src/components/chat/composerPromptHistory.ts
+64 -8
@@ -1,8 +1,14 @@
1 import { resolveUserMessagePresentation } from "@t3tools/client-runtime/user-message";
2 +import {
3 + EnvironmentContextRecord,
4 + type OrchestrationMessageContext,
5 + ThreadContextRecord,
6 +} from "@t3tools/contracts";
7 import {
8 ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
9 collectComposerContextReferences,
10 } from "@t3tools/shared/composerContextReferences";
11 +import { Schema } from "effect";
12 import { PLAN_IMPLEMENTATION_PROMPT_PREFIX } from "../../proposedPlan";
13
14 const CLAUDE_ULTRATHINK_PREFIX = "Ultrathink:\n";
@@ -10,13 +16,26 @@ const REVIEW_COMMENT_BLOCK_PATTERN = /<review_comment\b[^>]*>[\s\S]*?<\/review_c
16 const TRAILING_LEGACY_CONTEXT =
17 /\n*<(terminal_context|element_context|preview_annotation)>\n([\s\S]*?)\n<\/\1>\s*$/;
18
19 +const isThreadContextRecord = Schema.is(ThreadContextRecord);
20 +const isEnvironmentContextRecord = Schema.is(EnvironmentContextRecord);
21 +
22 type ComposerPromptHistoryMessage = Parameters<typeof resolveUserMessagePresentation>[0] & {
23 readonly id: string;
24 + readonly context?: OrchestrationMessageContext | undefined;
25 };
26
27 +/** Thread and machine mentions; the draft holds these records, so recall can restore their chips. */
28 +export interface ComposerPromptHistoryMentions {
29 + readonly threadContexts: ReadonlyArray<ThreadContextRecord>;
30 + readonly environmentContexts: ReadonlyArray<EnvironmentContextRecord>;
31 +}
32 +
33 +const NO_MENTIONS: ComposerPromptHistoryMentions = { threadContexts: [], environmentContexts: [] };
34 +
35 interface ComposerPromptHistoryEntry {
36 readonly id: string;
37 readonly prompt: string;
38 + readonly mentions: ComposerPromptHistoryMentions;
39 }
40
41 export interface ComposerPromptHistoryPosition {
@@ -36,6 +55,7 @@ function findActive(
55 interface ComposerPromptHistoryStep {
56 readonly position: ComposerPromptHistoryPosition | null;
57 readonly prompt: string;
58 + readonly mentions: ComposerPromptHistoryMentions;
59 }
60
61 function stripTrailingReviewComments(prompt: string): string {
@@ -70,7 +90,10 @@ function stripInlineTerminalLabels(prompt: string, headers: ReadonlyArray<string
90 return result;
91 }
92
73 -export function recallableComposerPrompt(messageText: string): string {
93 +export function recallableComposerPrompt(
94 + messageText: string,
95 + keptContextIds: ReadonlySet<string> = new Set(),
96 +): string {
97 let prompt = messageText.trim();
98 if (prompt.startsWith(CLAUDE_ULTRATHINK_PREFIX)) {
99 prompt = prompt.slice(CLAUDE_ULTRATHINK_PREFIX.length);
@@ -99,8 +122,9 @@ export function recallableComposerPrompt(messageText: string): string {
122 break;
123 }
124
102 - // Recall strips chips because their backing records are absent.
125 + // Chips without a record the draft can hold would render as unavailable.
126 for (const reference of collectComposerContextReferences(prompt).toReversed()) {
127 + if (keptContextIds.has(reference.contextId)) continue;
128 let { start, end } = reference;
129 if (prompt[end] === " ") end += 1;
130 else if (prompt[start - 1] === " ") start -= 1;
@@ -117,6 +141,29 @@ export function recallableComposerPrompt(messageText: string): string {
141 return trimmed;
142 }
143
144 +function recallMessage(
145 + message: ComposerPromptHistoryMessage,
146 +): Pick<ComposerPromptHistoryEntry, "prompt" | "mentions"> {
147 + const records = message.context?.records ?? [];
148 + const threadRecords = records.filter(isThreadContextRecord);
149 + const environmentRecords = records.filter(isEnvironmentContextRecord);
150 + const prompt = recallableComposerPrompt(
151 + message.text,
152 + new Set([...threadRecords, ...environmentRecords].map((record) => record.contextId)),
153 + );
154 + // A record whose chip is gone from the text would put the chip back when written to the draft.
155 + const referenced = new Set<string>(
156 + collectComposerContextReferences(prompt).map((reference) => reference.contextId),
157 + );
158 + return {
159 + prompt,
160 + mentions: {
161 + threadContexts: threadRecords.filter((record) => referenced.has(record.contextId)),
162 + environmentContexts: environmentRecords.filter((record) => referenced.has(record.contextId)),
163 + },
164 + };
165 +}
166 +
167 export function buildComposerPromptHistoryEntries(
168 messages: ReadonlyArray<ComposerPromptHistoryMessage>,
169 ): ComposerPromptHistoryEntry[] {
@@ -125,18 +172,27 @@ export function buildComposerPromptHistoryEntries(
172 if (message.role !== "user") continue;
173 // Automations and other agents send user-role messages; recall only what the user typed.
174 if (resolveUserMessagePresentation(message).attribution !== null) continue;
128 - const prompt = recallableComposerPrompt(message.text);
175 + const { prompt, mentions } = recallMessage(message);
176 if (prompt.length === 0) continue;
177 + const entry = { id: message.id, prompt, mentions };
178 const previous = entries[entries.length - 1];
179 if (previous && previous.prompt === prompt) {
132 - entries[entries.length - 1] = { id: message.id, prompt };
180 + entries[entries.length - 1] = entry;
181 continue;
182 }
135 - entries.push({ id: message.id, prompt });
183 + entries.push(entry);
184 }
185 return entries;
186 }
187
188 +function recall(entry: ComposerPromptHistoryEntry): ComposerPromptHistoryStep {
189 + return {
190 + position: { entryId: entry.id, recalled: entry.prompt },
191 + prompt: entry.prompt,
192 + mentions: entry.mentions,
193 + };
194 +}
195 +
196 export function stepComposerPromptHistory(input: {
197 readonly direction: "backward" | "forward";
198 readonly entries: ReadonlyArray<ComposerPromptHistoryEntry>;
@@ -151,11 +207,11 @@ export function stepComposerPromptHistory(input: {
207 if (activeIndex < 0 && currentPrompt.length > 0) return null;
208 const entry = entries[activeIndex < 0 ? entries.length - 1 : activeIndex - 1];
209 if (!entry) return null;
154 - return { position: { entryId: entry.id, recalled: entry.prompt }, prompt: entry.prompt };
210 + return recall(entry);
211 }
212
213 if (activeIndex < 0) return null;
214 const entry = entries[activeIndex + 1];
159 - if (!entry) return { position: null, prompt: "" };
160 - return { position: { entryId: entry.id, recalled: entry.prompt }, prompt: entry.prompt };
215 + if (!entry) return { position: null, prompt: "", mentions: NO_MENTIONS };
216 + return recall(entry);
217 }