Skip to content

Commit 16f7778

Browse files
committed
fix(web): validate composed provider prompts
1 parent c3609db commit 16f7778

4 files changed

Lines changed: 155 additions & 31 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4980,6 +4980,16 @@ function ChatViewContent(props: ChatViewProps) {
49804980
draftText: trimmed,
49814981
planMarkdown: activeProposedPlan.planMarkdown,
49824982
});
4983+
const outgoingFollowUpText = formatOutgoingPrompt({
4984+
provider: ctxSelectedProvider,
4985+
model: ctxSelectedModel,
4986+
models: ctxSelectedProviderModels,
4987+
effort: ctxSelectedPromptEffort,
4988+
text: followUp.text.trim(),
4989+
});
4990+
if (composerRef.current?.validateProviderInput(outgoingFollowUpText) === false) {
4991+
return;
4992+
}
49834993
promptRef.current = "";
49844994
clearComposerDraftContent(composerDraftTarget);
49854995
composerRef.current?.resetCursorState();
@@ -5049,24 +5059,6 @@ function ChatViewContent(props: ChatViewProps) {
50495059
return;
50505060
}
50515061

5052-
sendInFlightRef.current = true;
5053-
if (isDraftHeroState && activeThreadKey) {
5054-
let resolveDockStarted: (() => void) | undefined;
5055-
const dockStarted = new Promise<void>((resolve) => {
5056-
resolveDockStarted = resolve;
5057-
});
5058-
const dockTransition = runMobileComposerTransition(() => {
5059-
flushSync(() => {
5060-
captureDraftHeroComposerRect();
5061-
setDockedDraftHeroThreadKey(activeThreadKey);
5062-
});
5063-
resolveDockStarted?.();
5064-
});
5065-
void dockTransition.catch(() => resolveDockStarted?.());
5066-
await dockStarted;
5067-
}
5068-
beginLocalDispatch({ preparingWorktree: Boolean(baseBranchForWorktree) });
5069-
50705062
const composerImagesSnapshot = [...composerImages];
50715063
const composerTerminalContextsSnapshot = [...sendableComposerTerminalContexts];
50725064
const composerElementContextsSnapshot = [...composerElementContexts];
@@ -5084,15 +5076,37 @@ function ChatViewContent(props: ChatViewProps) {
50845076
messageTextWithPreviewAnnotations,
50855077
composerReviewCommentsSnapshot,
50865078
);
5087-
const messageIdForSend = newMessageId();
5088-
const messageCreatedAt = new Date().toISOString();
50895079
const outgoingMessageText = formatOutgoingPrompt({
50905080
provider: ctxSelectedProvider,
50915081
model: ctxSelectedModel,
50925082
models: ctxSelectedProviderModels,
50935083
effort: ctxSelectedPromptEffort,
50945084
text: messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT,
50955085
});
5086+
if (composerRef.current?.validateProviderInput(outgoingMessageText) === false) {
5087+
return;
5088+
}
5089+
5090+
sendInFlightRef.current = true;
5091+
if (isDraftHeroState && activeThreadKey) {
5092+
let resolveDockStarted: (() => void) | undefined;
5093+
const dockStarted = new Promise<void>((resolve) => {
5094+
resolveDockStarted = resolve;
5095+
});
5096+
const dockTransition = runMobileComposerTransition(() => {
5097+
flushSync(() => {
5098+
captureDraftHeroComposerRect();
5099+
setDockedDraftHeroThreadKey(activeThreadKey);
5100+
});
5101+
resolveDockStarted?.();
5102+
});
5103+
void dockTransition.catch(() => resolveDockStarted?.());
5104+
await dockStarted;
5105+
}
5106+
beginLocalDispatch({ preparingWorktree: Boolean(baseBranchForWorktree) });
5107+
5108+
const messageIdForSend = newMessageId();
5109+
const messageCreatedAt = new Date().toISOString();
50965110
const turnAttachmentsPromise = Promise.all(
50975111
composerImagesSnapshot.map(async (image) => ({
50985112
type: "image" as const,
@@ -5709,6 +5723,9 @@ function ChatViewContent(props: ChatViewProps) {
57095723
effort: ctxSelectedPromptEffort,
57105724
text: implementationPrompt,
57115725
});
5726+
if (composerRef.current?.validateProviderInput(outgoingImplementationPrompt) === false) {
5727+
return;
5728+
}
57125729
const nextThreadTitle = truncate(buildPlanImplementationThreadTitle(planMarkdown));
57135730
const nextThreadModelSelection: ModelSelection = ctxSelectedModelSelection;
57145731

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ import { cn, randomUUID } from "~/lib/utils";
108108
import { Separator } from "../ui/separator";
109109
import {
110110
getComposerPromptLengthValidationMessage,
111+
getComposerSubmissionValidationMessage,
111112
submitComposerDraft,
112113
} from "./composerSubmission";
113114
import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
@@ -489,6 +490,8 @@ export interface ChatComposerHandle {
489490
selectedModel: string;
490491
selectedProviderModels: ReadonlyArray<ServerProvider["models"][number]>;
491492
};
493+
/** Validate the fully composed text immediately before a provider turn starts. */
494+
validateProviderInput: (providerInput: string) => boolean;
492495
}
493496

494497
// --------------------------------------------------------------------------
@@ -953,6 +956,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
953956
const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);
954957
const [isComposerFocused, setIsComposerFocused] = useState(false);
955958
const [composerSubmissionError, setComposerSubmissionError] = useState<string | null>(null);
959+
const [providerInputSubmissionError, setProviderInputSubmissionError] = useState<string | null>(
960+
null,
961+
);
956962
const [composerMenuAnchor, setComposerMenuAnchor] = useState<HTMLDivElement | null>(null);
957963
const [isStashMenuOpen, setIsStashMenuOpen] = useState(false);
958964
const [stashPulse, setStashPulse] = useState<{ key: number; active: boolean }>({
@@ -1320,6 +1326,19 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
13201326
}
13211327
}, [composerSubmissionError, prompt]);
13221328

1329+
useEffect(() => {
1330+
setProviderInputSubmissionError(null);
1331+
}, [
1332+
composerElementContexts,
1333+
composerPreviewAnnotations,
1334+
composerReviewComments,
1335+
composerTerminalContexts,
1336+
prompt,
1337+
selectedModel,
1338+
selectedPromptEffort,
1339+
selectedProvider,
1340+
]);
1341+
13231342
useEffect(() => {
13241343
composerImagesRef.current = composerImages;
13251344
}, [composerImages, composerImagesRef]);
@@ -1412,6 +1431,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
14121431
useEffect(() => {
14131432
setComposerHighlightedItemId(null);
14141433
setComposerSubmissionError(null);
1434+
setProviderInputSubmissionError(null);
14151435
setComposerCursor(collapseExpandedComposerCursor(promptRef.current, promptRef.current.length));
14161436
setComposerTrigger(detectComposerTrigger(promptRef.current, promptRef.current.length));
14171437
dragDepthRef.current = 0;
@@ -2640,6 +2660,15 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
26402660
selectedModel,
26412661
selectedProviderModels,
26422662
}),
2663+
validateProviderInput: (providerInput: string) => {
2664+
const validationMessage = getComposerSubmissionValidationMessage({
2665+
prompt: promptRef.current,
2666+
providerInput,
2667+
submissionTarget: "provider-turn",
2668+
});
2669+
setProviderInputSubmissionError(validationMessage);
2670+
return validationMessage === null;
2671+
},
26432672
}),
26442673
[
26452674
activeThread,
@@ -3110,7 +3139,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
31103139
</div>
31113140
</div>
31123141

3113-
<ComposerPromptLengthValidation message={composerSubmissionError} />
3142+
<ComposerPromptLengthValidation
3143+
message={providerInputSubmissionError ?? composerSubmissionError}
3144+
/>
31143145

31153146
{/* Bottom toolbar */}
31163147
{isComposerCollapsedMobile ? null : activePendingApproval ? (

‎apps/web/src/components/chat/composerSubmission.test.ts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,71 @@ describe("submitComposerDraft", () => {
5353
expect(preventDefault).not.toHaveBeenCalled();
5454
});
5555

56+
it("blocks when appended context pushes the provider input over the shared limit", () => {
57+
const draft = "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS);
58+
const onSend = vi.fn();
59+
60+
const result = submitComposerDraft({
61+
prompt: draft,
62+
providerInput: `${draft}\n\nTerminal context`,
63+
submissionTarget: "provider-turn",
64+
event: undefined,
65+
onSend,
66+
});
67+
68+
expect(result).toEqual({
69+
validationMessage:
70+
"Prompt is 18 characters over the 120,000-character limit. Shorten or split it before sending.",
71+
didDispatch: false,
72+
});
73+
expect(draft).toHaveLength(PROVIDER_SEND_TURN_MAX_INPUT_CHARS);
74+
expect(onSend).not.toHaveBeenCalled();
75+
76+
const correctedResult = submitComposerDraft({
77+
prompt: "Corrected prompt",
78+
providerInput: "Corrected prompt\n\nShort terminal context",
79+
submissionTarget: "provider-turn",
80+
event: undefined,
81+
onSend,
82+
});
83+
84+
expect(correctedResult).toEqual({ validationMessage: null, didDispatch: true });
85+
expect(onSend).toHaveBeenCalledOnce();
86+
});
87+
88+
it("allows fully composed provider input at the shared character limit", () => {
89+
const onSend = vi.fn();
90+
91+
const result = submitComposerDraft({
92+
prompt: "Short draft",
93+
providerInput: "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS),
94+
submissionTarget: "provider-turn",
95+
event: undefined,
96+
onSend,
97+
});
98+
99+
expect(result).toEqual({ validationMessage: null, didDispatch: true });
100+
expect(onSend).toHaveBeenCalledOnce();
101+
});
102+
103+
it("blocks a generated plan follow-up that exceeds the shared limit", () => {
104+
const onSend = vi.fn();
105+
106+
const result = submitComposerDraft({
107+
prompt: "",
108+
providerInput: `PLEASE IMPLEMENT THIS PLAN:\n${"x".repeat(
109+
PROVIDER_SEND_TURN_MAX_INPUT_CHARS,
110+
)}`,
111+
submissionTarget: "provider-turn",
112+
event: undefined,
113+
onSend,
114+
});
115+
116+
expect(result.didDispatch).toBe(false);
117+
expect(result.validationMessage).toContain("over the 120,000-character limit");
118+
expect(onSend).not.toHaveBeenCalled();
119+
});
120+
56121
it("allows surrounding whitespace that the provider turn contract trims", () => {
57122
const draft = ` ${"x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS)} `;
58123
const onSend = vi.fn();

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

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts";
22

33
type ComposerSubmitEvent = { preventDefault: () => void };
44

5+
type ComposerSubmissionInput = {
6+
prompt: string;
7+
providerInput?: string;
8+
submissionTarget: "provider-turn" | "pending-user-input";
9+
};
10+
511
export function getComposerPromptLengthValidationMessage(prompt: string): string | null {
612
const excessCharacters = prompt.trim().length - PROVIDER_SEND_TURN_MAX_INPUT_CHARS;
713
if (excessCharacters <= 0) return null;
@@ -10,16 +16,21 @@ export function getComposerPromptLengthValidationMessage(prompt: string): string
1016
return `Prompt is ${excessCharacters.toLocaleString("en-US")} ${characterLabel} over the ${PROVIDER_SEND_TURN_MAX_INPUT_CHARS.toLocaleString("en-US")}-character limit. Shorten or split it before sending.`;
1117
}
1218

13-
export function submitComposerDraft(options: {
14-
prompt: string;
15-
submissionTarget: "provider-turn" | "pending-user-input";
16-
event: ComposerSubmitEvent | undefined;
17-
onSend: (event?: ComposerSubmitEvent) => void;
18-
}): { validationMessage: string | null; didDispatch: boolean } {
19-
const validationMessage =
20-
options.submissionTarget === "provider-turn"
21-
? getComposerPromptLengthValidationMessage(options.prompt)
22-
: null;
19+
export function getComposerSubmissionValidationMessage(
20+
options: ComposerSubmissionInput,
21+
): string | null {
22+
return options.submissionTarget === "provider-turn"
23+
? getComposerPromptLengthValidationMessage(options.providerInput ?? options.prompt)
24+
: null;
25+
}
26+
27+
export function submitComposerDraft(
28+
options: ComposerSubmissionInput & {
29+
event: ComposerSubmitEvent | undefined;
30+
onSend: (event?: ComposerSubmitEvent) => void;
31+
},
32+
): { validationMessage: string | null; didDispatch: boolean } {
33+
const validationMessage = getComposerSubmissionValidationMessage(options);
2334
if (validationMessage) {
2435
options.event?.preventDefault();
2536
return { validationMessage, didDispatch: false };

0 commit comments

Comments
 (0)