Skip to content

feat: Enable new prompt input while waiting for an answer #6676

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
merged 7 commits into from
Oct 14, 2025
Merged

feat: Enable new prompt input while waiting for an answer #6676

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31d5348
enable new prompt input while waiting for an answer
bytrangle Sep 30, 2025
2d127d2
resolve merge conflict
bytrangle Oct 1, 2025
b1d01ce
Merge branch 'dev' into feat_enable-new-question-during-answer-genera…
bytrangle Oct 5, 2025
5823a55
Merge branch 'dev' into feat_enable-new-question-during-answer-genera…
bytrangle Oct 10, 2025
503cd0c
correct spelling of handleSendMessage function
bytrangle Oct 10, 2025
2816bb6
remove test for disabling input while streaming content
bytrangle Oct 11, 2025
cad2007
Merge branch 'dev' into feat_enable-new-question-during-answer-genera…
bytrangle Oct 14, 2025
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
152 changes: 74 additions & 78 deletions web-app/src/containers/ChatInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,12 @@ const ChatInput = ({
const mcpExtension = extensionManager.get<MCPExtension>(ExtensionTypeEnum.MCP)
const MCPToolComponent = mcpExtension?.getToolComponent?.()


const handleSendMesage = async (prompt: string) => {
if (!selectedModel) {
setMessage('Please select a model to start chatting.')
return
}
if (!prompt.trim() && uploadedFiles.length === 0) {
return
}
setMessage('')
sendMessage(
prompt,
true,
Expand Down Expand Up @@ -591,7 +587,6 @@ const ChatInput = ({
)}
<TextareaAutosize
ref={textareaRef}
disabled={Boolean(streamingContent)}
minRows={2}
rows={1}
maxRows={10}
Expand All @@ -607,15 +602,15 @@ const ChatInput = ({
// e.keyCode 229 is for IME input with Safari
const isComposing =
e.nativeEvent.isComposing || e.keyCode === 229
if (
e.key === 'Enter' &&
!e.shiftKey &&
prompt.trim() &&
!isComposing
) {
if (e.key === 'Enter' && !e.shiftKey && !isComposing) {
e.preventDefault()
// Submit the message when Enter is pressed without Shift
handleSendMesage(prompt)
// Submit prompt when the following conditions are met:
// - Enter is pressed without Shift
// - The streaming content has finished
// - Prompt is not empty
if (!streamingContent && prompt.trim()) {
handleSendMesage(prompt)
}
// When Shift+Enter is pressed, a new line is added (default behavior)
}
}}
Expand Down Expand Up @@ -703,74 +698,75 @@ const ChatInput = ({
)}

{selectedModel?.capabilities?.includes('tools') &&
hasActiveMCPServers && (
MCPToolComponent ? (
// Use custom MCP component
<McpExtensionToolLoader
tools={tools}
hasActiveMCPServers={hasActiveMCPServers}
selectedModelHasTools={selectedModel?.capabilities?.includes('tools') ?? false}
initialMessage={initialMessage}
MCPToolComponent={MCPToolComponent}
/>
) : (
// Use default tools dropdown
<TooltipProvider>
<Tooltip
open={tooltipToolsAvailable}
onOpenChange={setTooltipToolsAvailable}
hasActiveMCPServers &&
(MCPToolComponent ? (
// Use custom MCP component
<McpExtensionToolLoader
tools={tools}
hasActiveMCPServers={hasActiveMCPServers}
selectedModelHasTools={
selectedModel?.capabilities?.includes('tools') ?? false
}
initialMessage={initialMessage}
MCPToolComponent={MCPToolComponent}
/>
) : (
// Use default tools dropdown
<TooltipProvider>
<Tooltip
open={tooltipToolsAvailable}
onOpenChange={setTooltipToolsAvailable}
>
<TooltipTrigger
asChild
disabled={dropdownToolsAvailable}
>
<TooltipTrigger
asChild
disabled={dropdownToolsAvailable}
<div
onClick={(e) => {
setDropdownToolsAvailable(false)
e.stopPropagation()
}}
>
<div
onClick={(e) => {
setDropdownToolsAvailable(false)
e.stopPropagation()
<DropdownToolsAvailable
initialMessage={initialMessage}
onOpenChange={(isOpen) => {
setDropdownToolsAvailable(isOpen)
if (isOpen) {
setTooltipToolsAvailable(false)
}
}}
>
<DropdownToolsAvailable
initialMessage={initialMessage}
onOpenChange={(isOpen) => {
setDropdownToolsAvailable(isOpen)
if (isOpen) {
setTooltipToolsAvailable(false)
}
}}
>
{(isOpen, toolsCount) => {
return (
<div
className={cn(
'h-7 p-1 flex items-center justify-center rounded-sm hover:bg-main-view-fg/10 transition-all duration-200 ease-in-out gap-1 cursor-pointer relative',
isOpen && 'bg-main-view-fg/10'
)}
>
<IconTool
size={18}
className="text-main-view-fg/50"
/>
{toolsCount > 0 && (
<div className="absolute -top-2 -right-2 bg-accent text-accent-fg text-xs rounded-full size-5 flex items-center justify-center font-medium">
<span className="leading-0 text-xs">
{toolsCount > 99 ? '99+' : toolsCount}
</span>
</div>
)}
</div>
)
}}
</DropdownToolsAvailable>
</div>
</TooltipTrigger>
<TooltipContent>
<p>{t('tools')}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
)
)}
{(isOpen, toolsCount) => {
return (
<div
className={cn(
'h-7 p-1 flex items-center justify-center rounded-sm hover:bg-main-view-fg/10 transition-all duration-200 ease-in-out gap-1 cursor-pointer relative',
isOpen && 'bg-main-view-fg/10'
)}
>
<IconTool
size={18}
className="text-main-view-fg/50"
/>
{toolsCount > 0 && (
<div className="absolute -top-2 -right-2 bg-accent text-accent-fg text-xs rounded-full size-5 flex items-center justify-center font-medium">
<span className="leading-0 text-xs">
{toolsCount > 99 ? '99+' : toolsCount}
</span>
</div>
)}
</div>
)
}}
</DropdownToolsAvailable>
</div>
</TooltipTrigger>
<TooltipContent>
<p>{t('tools')}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
))}
{selectedModel?.capabilities?.includes('web_search') && (
<TooltipProvider>
<Tooltip>
Expand Down
Loading