Skip to content

fix(web): keep thread context when stashing prompts #18843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 7 commits into from
Oct 20, 2026
Merged

fix(web): keep thread context when stashing prompts #18843

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
958969e
fix(web): preserve thread context when copying or stashing prompts
saphid Oct 12, 2026
4ba59cc
Merge remote-tracking branch 'origin/main' into pr18843-fix
saphid Oct 14, 2026
1add151
refactor(web): narrow to keeping thread context when stashing
saphid Oct 14, 2026
1df4c32
fix(web): restore stashed thread context to the prompt draft
saphid Oct 14, 2026
095c78c
chore: integrate upstream main for fix(web): keep thread context when…
github-actions[bot] Oct 17, 2026
c2858b9
Merge remote-tracking branch 'origin/main' into t3code/sweep/composer…
juliusmarminge Oct 19, 2026
6c2dcef
Merge remote-tracking branch 'origin/main' into t3code/sweep/composer…
juliusmarminge Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions apps/web/src/components/chat/ChatComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,6 +3178,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const importContextRecords = (
records: ReadonlyArray<ComposerContextRecord>,
sourceEnvironmentId: EnvironmentId | null,
threadDraftTarget = attachmentDraftTarget,
): ReadonlyMap<string, string> => {
const rewritten = new Map<string, string>();
const dependentAttachmentLocalIds = new Map<string, string>();
Expand Down Expand Up @@ -3232,7 +3233,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
: existing
? (uploadedContextRecordFromDraft(existing) ?? undefined)
: undefined;
if (existingRecord && isSameComposerContextPayload(existingRecord, record)) {
if (
existingRecord &&
isSameComposerContextPayload(existingRecord, record) &&
(record.kind !== "thread" || threadDraftTarget === attachmentDraftTarget)
) {
if (record.kind === "preview-annotation" && record.screenshotContextId) {
skippedDependentAttachmentIds.add(record.screenshotContextId);
}
Expand Down Expand Up @@ -3279,7 +3284,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
case "thread": {
// The agent can only read threads on its own server; a pasted foreign one is dropped.
if (record.environmentId !== environmentId) break;
addComposerDraftThreadContexts(attachmentDraftTarget, [record], {
addComposerDraftThreadContexts(threadDraftTarget, [record], {
appendReference: false,
});
rewritten.set(record.contextId, record.contextId);
Expand Down Expand Up @@ -4344,7 +4349,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
}

const rewrittenContextIds = entry.records
? importContextRecords(entry.records, null)
? importContextRecords(entry.records, null, composerDraftTarget)
: new Map<string, string>();
const restoredPrompt = replaceComposerContextReferences(entry.prompt, (reference) => {
const contextId = rewrittenContextIds.get(reference.contextId);
Expand Down Expand Up @@ -4597,6 +4602,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const images = [...composerImagesRef.current];
const files = [...composerFilesRef.current];
const stashedRecords: ComposerContextRecord[] = [
...composerThreadContexts,
...composerTerminalContextsRef.current.map(terminalContextRecord),
...composerReviewComments.map(reviewCommentContextRecord),
...composerPreviewAnnotations.map((annotation) =>
Expand Down Expand Up @@ -4702,6 +4708,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
promptRef.current = "";
clearComposerDraftPromptAndImages(stashTarget);
clearComposerDraftTerminalContexts(stashTarget);
setComposerDraftThreadContexts(stashTarget, []);
for (const comment of composerReviewComments) {
removeComposerDraftReviewComment(stashTarget, comment.id);
}
Expand Down
Loading