Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🛶 fix: Reconcile Canary Sync Checks

Lia3ae115785ef8
diff --git a/api/server/controllers/agents/v1.spec.js b/api/server/controllers/agents/v1.spec.js
index 8080e56f95..80b71d7aa6 100644
--- a/api/server/controllers/agents/v1.spec.js
+++ b/api/server/controllers/agents/v1.spec.js
@@ -3,7 +3,12 @@ const express = require('express');
const request = require('supertest');
const { nanoid } = require('nanoid');
const { v4: uuidv4 } = require('uuid');
-const { AgentSortCursorError, createModels, tenantStorage } = require('@librechat/data-schemas');
+const {
+ AgentSortCursorError,
+ createModels,
+ tenantStorage,
+ SystemCapabilities,
+} = require('@librechat/data-schemas');
const {
Tools,
SkillsScope,
diff --git a/client/src/components/Chat/BackgroundTasks/Button.tsx b/client/src/components/Chat/BackgroundTasks/Button.tsx
index b48d4c22a6..2c601bd9a8 100644
--- a/client/src/components/Chat/BackgroundTasks/Button.tsx
+++ b/client/src/components/Chat/BackgroundTasks/Button.tsx
@@ -103,18 +103,13 @@ function BackgroundTasksButton({
store={popover}
aria-label={triggerLabel}
data-testid="header-background-tasks-button"
- className="relative inline-flex size-9 flex-shrink-0 items-center justify-center rounded-xl border border-border-light bg-presentation text-text-primary transition-all ease-in-out hover:bg-surface-tertiary aria-expanded:bg-surface-tertiary"
+ className="border-border-light bg-presentation text-text-primary hover:bg-surface-tertiary aria-expanded:bg-surface-tertiary relative inline-flex size-9 flex-shrink-0 items-center justify-center rounded-xl border transition-all ease-in-out"
>
<ListTodo className="icon-md" aria-hidden="true" />
{(activeCount > 0 || awaitingCount > 0 || failedCount > 0 || incomplete) && (
<span
aria-hidden="true"
- data-testid="background-tasks-indicator"
- className={cn(
- 'absolute -right-0.5 -top-0.5 size-2 rounded-full ring-2 ring-presentation',
- failedCount > 0 || incomplete ? 'bg-status-warning' : 'bg-status-info',
- activeCount > 0 && 'animate-pulse motion-reduce:animate-none',
- )}
+ className="bg-status-info ring-presentation absolute -right-0.5 -top-0.5 size-2 animate-pulse rounded-full ring-2 motion-reduce:animate-none"
/>
)}
</Ariakit.PopoverDisclosure>
@@ -129,7 +124,7 @@ function BackgroundTasksButton({
finalFocus={disclosureRef}
aria-label={title}
className={cn(
- 'z-[200] flex max-h-[min(36rem,calc(100vh-5rem))] max-w-[calc(100vw-2rem)] flex-col rounded-xl border border-border-medium bg-surface-secondary text-text-primary shadow-lg focus:outline-none',
+ 'border-border-medium bg-surface-secondary text-text-primary z-[200] flex max-h-[min(36rem,calc(100vh-5rem))] max-w-[calc(100vw-2rem)] flex-col rounded-xl border shadow-lg focus:outline-none',
wide ? 'w-[36rem]' : 'w-80',
)}
>
@@ -161,11 +156,11 @@ function BackgroundTasksButton({
</p>
)}
{view.loadFailed && (
- <div role="alert" className="text-sm text-status-error">
+ <div role="alert" className="text-status-error text-sm">
<p>{localize('com_ui_background_tasks_load_failed')}</p>
<button
type="button"
- className="rounded px-2 py-1 text-text-primary underline focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="text-text-primary focus-visible:ring-ring-primary rounded px-2 py-1 underline focus-visible:ring-2"
onClick={() => void view.retry()}
>
{localize('com_ui_retry')}
@@ -193,7 +188,7 @@ function BackgroundTasksButton({
disabled={!anyStoppable || view.isStopping}
onClick={() => void view.stopAll()}
data-testid="background-tasks-stop-all"
- className={cn(iconButtonClass, 'border border-border-medium')}
+ className={cn(iconButtonClass, 'border-border-medium border')}
>
<Square className="size-3 fill-current" aria-hidden="true" />
</button>
@@ -211,7 +206,7 @@ function BackgroundTasksButton({
</Section>
)}
{view.stopFailed && (
- <p role="alert" className="px-3 pb-3 text-sm text-status-error">
+ <p role="alert" className="text-status-error px-3 pb-3 text-sm">
{localize('com_ui_background_tasks_stop_failed')}
</p>
)}
diff --git a/client/src/components/Chat/BackgroundTasks/Card.tsx b/client/src/components/Chat/BackgroundTasks/Card.tsx
index e80d01f30d..26528bc440 100644
--- a/client/src/components/Chat/BackgroundTasks/Card.tsx
+++ b/client/src/components/Chat/BackgroundTasks/Card.tsx
@@ -63,7 +63,7 @@ function TaskCard({
const expandable = row.detail != null;
return (
- <li className="rounded-lg bg-surface-tertiary px-3 py-2" data-testid="background-task-row">
+ <li className="bg-surface-tertiary rounded-lg px-3 py-2" data-testid="background-task-row">
<div className="flex items-start gap-2">
<div className="min-w-0 flex-1">
{expandable ? (
@@ -72,21 +72,21 @@ function TaskCard({
aria-expanded={open}
aria-controls={detailId}
onClick={() => setOpen((value) => !value)}
- className="flex max-w-full items-start gap-1 rounded text-left text-sm text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="text-text-primary focus-visible:ring-ring-primary flex max-w-full items-start gap-1 rounded text-left text-sm focus-visible:outline-none focus-visible:ring-2"
>
<span className="line-clamp-2 break-words">{title}</span>
<ChevronDown
aria-hidden="true"
className={cn(
- 'mt-1 size-3.5 shrink-0 text-text-secondary transition-transform motion-reduce:transition-none',
+ 'text-text-secondary mt-1 size-3.5 shrink-0 transition-transform motion-reduce:transition-none',
open && 'rotate-180',
)}
/>
</button>
) : (
- <p className="line-clamp-2 break-words text-sm text-text-primary">{title}</p>
+ <p className="text-text-primary line-clamp-2 break-words text-sm">{title}</p>
)}
- <p className="mt-0.5 flex items-center gap-2 text-xs text-text-secondary">
+ <p className="text-text-secondary mt-0.5 flex items-center gap-2 text-xs">
{title !== kindLabel && <span className="font-medium">{kindLabel}</span>}
{active ? null : (
<span className={STATUS_CLASSES[row.status]}>
@@ -122,19 +122,19 @@ function TaskCard({
aria-label={`${stopLabel}: ${title}`}
disabled={isStopping}
onClick={() => onStop(row)}
- className="flex size-7 shrink-0 items-center justify-center rounded-md border border-border-medium text-text-primary hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary disabled:opacity-50"
+ className="border-border-medium text-text-primary hover:bg-surface-hover focus-visible:ring-ring-primary flex size-7 shrink-0 items-center justify-center rounded-md border focus-visible:outline-none focus-visible:ring-2 disabled:opacity-50"
>
<Square className="size-3" aria-hidden="true" />
</button>
}
/>
)}
- {row.status === 'stopping' && <Spinner className="size-4 shrink-0 text-text-secondary" />}
+ {row.status === 'stopping' && <Spinner className="size-4 shrink-0" />}
</div>
{expandable && open && (
<pre
id={detailId}
- className="mt-2 max-h-48 overflow-auto whitespace-pre-wrap break-words rounded-md bg-surface-primary p-2 font-mono text-xs text-text-primary"
+ className="bg-surface-primary text-text-primary mt-2 max-h-48 overflow-auto whitespace-pre-wrap break-words rounded-md p-2 font-mono text-xs"
>
{row.detail}
</pre>
diff --git a/client/src/components/Chat/BackgroundTasks/Section.tsx b/client/src/components/Chat/BackgroundTasks/Section.tsx
index aa8527ed87..072e31430e 100644
--- a/client/src/components/Chat/BackgroundTasks/Section.tsx
+++ b/client/src/components/Chat/BackgroundTasks/Section.tsx
@@ -26,7 +26,7 @@ export default function Section({
aria-expanded={open}
aria-controls={listId}
onClick={() => setOpen((value) => !value)}
- className="flex min-w-0 flex-1 items-center gap-1 rounded text-sm text-text-secondary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="text-text-secondary hover:text-text-primary focus-visible:ring-ring-primary flex min-w-0 flex-1 items-center gap-1 rounded text-sm focus-visible:outline-none focus-visible:ring-2"
>
<span>{label}</span>
<span className="tabular-nums">{count}</span>
diff --git a/client/src/components/Chat/ChatView.tsx b/client/src/components/Chat/ChatView.tsx
index fe7202deeb..9a1b3f0f69 100644
--- a/client/src/components/Chat/ChatView.tsx
+++ b/client/src/components/Chat/ChatView.tsx
@@ -192,36 +192,39 @@ function ChatView({ index = 0, project }: { index?: number; project?: TChatProje
popover ⇄ chat-card morph) paints the whole composer band
over the travelling card instead of letting it show
through below the composer. The background matches the
- page, so normal rendering is unchanged. */}
- <div
- className={cn(
- 'bg-surface-primary-alt w-full [view-transition-name:chat-form]',
- !isLandingPage && 'scrollbar-gutter-spacer',
- isLandingPage && 'max-w-3xl transition-all duration-200 xl:max-w-4xl',
- )}
- >
- {isLandingPage && <ConversationStarters />}
- {isSubagentThreadReadOnly ? (
- <div
- className="text-text-secondary mx-auto w-full max-w-3xl px-4 py-3 text-center text-sm xl:max-w-4xl"
- role="note"
- >
- {localize('com_ui_subagent_thread_read_only')}
- </div>
- ) : (
- <ChatForm
- index={index}
- placeholder={chatFormPlaceholder}
- project={isProjectLandingPage ? project : undefined}
- isLandingPage={isLandingPage}
- footerBelow={footerBelow}
- centerFormOnLanding={centerFormOnLanding}
- />
- )}
- {/* The generic disclaimer and the policy links are the
- welcome screen's; a deployment's own footer stays
- with the conversation that always showed it. */}
- {!isLandingPage && configuredFooter && <Footer configuredOnly />}
+ page, so normal rendering is unchanged. The named surface
+ is a stacking context; keep it above positioned tool glyphs
+ so they cannot paint through the approval preview. */}
+ <div
+ className={cn(
+ 'bg-surface-primary-alt relative z-10 w-full [view-transition-name:chat-form]',
+ !isLandingPage && 'scrollbar-gutter-spacer',
+ isLandingPage && 'max-w-3xl transition-all duration-200 xl:max-w-4xl',
+ )}
+ >
+ {isLandingPage && <ConversationStarters />}
+ {isSubagentThreadReadOnly ? (
+ <div
+ className="text-text-secondary mx-auto w-full max-w-3xl px-4 py-3 text-center text-sm xl:max-w-4xl"
+ role="note"
+ >
+ {localize('com_ui_subagent_thread_read_only')}
+ </div>
+ ) : (
+ <ChatForm
+ index={index}
+ placeholder={chatFormPlaceholder}
+ project={isProjectLandingPage ? project : undefined}
+ isLandingPage={isLandingPage}
+ footerBelow={footerBelow}
+ centerFormOnLanding={centerFormOnLanding}
+ />
+ )}
+ {/* The generic disclaimer is the welcome screen's; a
+ deployment's own footer, privacy policy and terms
+ stay with the conversation that always showed them. */}
+ {!isLandingPage && configuredFooter && <Footer configuredOnly />}
+ </div>
</div>
{isLandingPage && <Footer />}
</>
diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsx
index 32a48e7763..fd50568afa 100644
--- a/client/src/components/Chat/Header.tsx
+++ b/client/src/components/Chat/Header.tsx
@@ -79,8 +79,10 @@ function Header({
const hiddenBehindNav = navVisible === true && 'max-md:hidden';
return (
- <div className="from-surface-primary-alt via-surface-primary-alt/70 text-text-primary md:from-surface-primary-alt/80 md:via-surface-primary-alt/50 2xl:from-surface-primary-alt/0 absolute top-0 z-10 flex h-[52px] w-full items-center gap-2 bg-gradient-to-b to-transparent p-2 font-semibold 2xl:via-transparent">
- <div className="flex shrink-0 items-center md:hidden">
+ /* The composer review is in a z-10 stacking context. Keep header controls
+ above it when a tall review reaches the top of a short viewport. */
+ <div className="from-surface-primary-alt via-surface-primary-alt/70 text-text-primary md:from-surface-primary-alt/80 md:via-surface-primary-alt/50 2xl:from-surface-primary-alt/0 absolute top-0 z-20 flex h-[52px] w-full items-center gap-2 bg-gradient-to-b to-transparent p-2 font-semibold 2xl:via-transparent">
+ <div className="flex flex-shrink-0 items-center md:hidden">
<OpenSidebar testId="header-open-sidebar-button" />
</div>
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index 3676a2a272..1be3644fc8 100644
--- a/client/src/components/Chat/Input/ChatForm.tsx
+++ b/client/src/components/Chat/Input/ChatForm.tsx
@@ -681,7 +681,7 @@ const ChatForm = memo(function ChatForm({
data-testid="composer-context-rail"
className={cn(
'mx-4 -mb-3 flex min-w-0 flex-wrap items-center gap-1 rounded-t-2xl',
- 'border-border-light bg-surface-secondary border px-2 pt-1 pb-4',
+ 'border-border-light bg-surface-secondary border px-2 pb-4 pt-1',
isRTL && 'flex-row-reverse',
)}
>
@@ -734,7 +734,7 @@ const ChatForm = memo(function ChatForm({
squared off at the bottom (`rounded-t-theme-surface-lg`) and no disclaimer
follows it — so the action row is the last thing in it, with no
band of padding under the buttons. */
- 'rounded-t-theme-surface-lg sm:rounded-theme-surface-lg relative flex w-full grow flex-col overflow-hidden',
+ 'relative flex w-full grow flex-col overflow-hidden rounded-t-theme-surface-lg sm:rounded-theme-surface-lg',
composerSurfaceClasses(),
isTextAreaFocused ? composerSurfaceShadow.focused : composerSurfaceShadow.blurred,
/* Temporary-chat accent is a ChatForm-only override, not part of
@@ -837,7 +837,7 @@ const ChatForm = memo(function ChatForm({
)}
/>
</div>
- <div className="flex flex-col items-start justify-start pt-1.5 pr-2.5">
+ <div className="flex flex-col items-start justify-start pr-2.5 pt-1.5">
<CollapseChat
isCollapsed={isCollapsed}
isScrollable={isMoreThanThreeRows}
diff --git a/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx b/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx
index 896daf227d..93a19660e2 100644
--- a/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx
+++ b/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx
@@ -205,7 +205,7 @@ export default function CodeWorkspaceMenu({
const pending = status === 'pending';
return (
<div className="flex min-w-0 flex-wrap items-center gap-2">
- <span role="status" className="text-xs text-text-secondary">
+ <span role="status" className="text-text-secondary text-xs">
{localize(
pending
? 'com_ui_code_workspace_reconciling'
@@ -340,7 +340,10 @@ export default function CodeWorkspaceMenu({
}
>
<Icon className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
- <span className="max-w-[16rem] min-w-0 truncate">{label}</span>
+ <span role="status" className="min-w-0 max-w-[16rem] truncate">
+ {label}
+ </span>
+ <RefreshCw className="text-text-secondary size-3 shrink-0" aria-hidden="true" />
</TooltipAnchor>
);
}
@@ -369,7 +372,7 @@ export default function CodeWorkspaceMenu({
}
className={cn(
composerControlClasses(),
- 'md:px-theme-normal max-w-full min-w-0 px-2.5',
+ 'min-w-0 max-w-full px-2.5 md:px-theme-normal',
isOpen && 'bg-surface-hover',
buttonDisabled && 'cursor-not-allowed opacity-50',
)}
@@ -377,7 +380,7 @@ export default function CodeWorkspaceMenu({
}
>
<ButtonIcon className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
- <span className="max-w-[12rem] min-w-0 truncate">{relocationText?.label ?? label}</span>
+ <span className="min-w-0 max-w-[12rem] truncate">{buttonLabel}</span>
<ChevronDown
className={cn(
'text-text-secondary size-3 shrink-0 transition-transform',
@@ -391,7 +394,7 @@ export default function CodeWorkspaceMenu({
gutter={8}
unmountOnHide={true}
className={cn(
- 'z-50 flex max-w-[min(360px,calc(100vw-2rem))] min-w-[280px] flex-col rounded-xl',
+ 'z-50 flex min-w-[280px] max-w-[min(360px,calc(100vw-2rem))] flex-col rounded-xl',
'border-border-light bg-presentation max-h-[var(--popover-available-height)] overflow-y-auto border p-1.5 shadow-lg',
'origin-bottom opacity-0 transition-[opacity,transform] duration-200 ease-out',
'data-[enter]:scale-100 data-[enter]:opacity-100',
@@ -403,8 +406,8 @@ export default function CodeWorkspaceMenu({
<Ariakit.MenuHeading render={<div />} className={headingClasses}>
{transitionText.label}
</Ariakit.MenuHeading>
- <p className="text-text-secondary px-2.5 pb-2 text-xs">{relocationText.info}</p>
- {relocation.targets.map((target) => (
+ <p className="text-text-secondary px-2.5 pb-2 text-xs">{transitionText.info}</p>
+ {transition.targets.map((target) => (
<EnvironmentWorkspaces
key={target.environment.id}
environment={target.environment}
@@ -421,20 +424,47 @@ export default function CodeWorkspaceMenu({
/>
))}
<Ariakit.MenuSeparator className="border-border-light my-1 h-0 w-full border-t" />
- <Ariakit.MenuItem
- disabled={!moveReady || moveMutation.isLoading}
- hideOnClick={true}
- onClick={confirmMove}
- className={cn(
- menuItemClasses(),
- 'items-center aria-disabled:cursor-not-allowed aria-disabled:opacity-50',
- )}
- >
- <FolderSync className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
- <span className="text-text-primary min-w-0 flex-1 truncate text-left text-sm font-medium">
- {relocationText.label}
- </span>
- </Ariakit.MenuItem>
+ {offersMove && (
+ <Ariakit.MenuItem
+ disabled={disabled || !moveReady || moveMutation.isLoading}
+ hideOnClick={true}
+ onClick={confirmMove}
+ className={cn(
+ menuItemClasses(),
+ 'items-center aria-disabled:cursor-not-allowed aria-disabled:opacity-50',
+ )}
+ >
+ <ConfirmIcon className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
+ <span className="text-text-primary min-w-0 flex-1 truncate text-left text-sm font-medium">
+ {transitionText.label}
+ </span>
+ </Ariakit.MenuItem>
+ )}
+ {transition.detachable && (
+ <Ariakit.MenuItem
+ data-testid="code-workspace-detach"
+ disabled={disabled || moveMutation.isLoading}
+ hideOnClick={true}
+ onClick={confirmDetach}
+ className={cn(
+ menuItemClasses(),
+ 'aria-disabled:cursor-not-allowed aria-disabled:opacity-50',
+ )}
+ >
+ <FolderX
+ className="text-text-secondary mt-0.5 size-4 shrink-0"
+ aria-hidden="true"
+ />
+ <div className="min-w-0 flex-1 text-left">
+ <div className="text-text-primary truncate text-sm font-medium">
+ {localize('com_ui_code_workspace_detach')}
+ </div>
+ <p className="text-text-secondary text-xs">
+ {localize('com_ui_code_workspace_detach_info')}
+ </p>
+ </div>
+ </Ariakit.MenuItem>
+ )}
</>
) : (
<>
@@ -482,7 +512,7 @@ export default function CodeWorkspaceMenu({
))}
</>
)}
- <Ariakit.MenuSeparator className="my-1 h-0 w-full border-t border-border-light" />
+ <Ariakit.MenuSeparator className="border-border-light my-1 h-0 w-full border-t" />
<Ariakit.MenuItem
disabled={buttonDisabled || isRefreshing}
hideOnClick={false}
@@ -493,8 +523,8 @@ export default function CodeWorkspaceMenu({
'items-center aria-disabled:cursor-not-allowed aria-disabled:opacity-50',
)}
>
- <RefreshCw className="size-4 shrink-0 text-text-secondary" aria-hidden="true" />
- <span className="text-sm font-medium text-text-primary">
+ <RefreshCw className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
+ <span className="text-text-primary text-sm font-medium">
{localize('com_ui_refresh')}
</span>
</Ariakit.MenuItem>
diff --git a/client/src/components/Chat/Input/PendingSteerChips.tsx b/client/src/components/Chat/Input/PendingSteerChips.tsx
index 19167b0e50..b5986ad183 100644
--- a/client/src/components/Chat/Input/PendingSteerChips.tsx
+++ b/client/src/components/Chat/Input/PendingSteerChips.tsx
@@ -327,12 +327,12 @@ function QueuedRow({
0: String(fileCount),
})}
/>
- {(isRejected || isUnconfirmed || isIndeterminate) && (
- <span className="text-text-warning shrink-0 text-xs">{localize(statusLabel)}</span>
- )}
- {revealed === true && (
- <span className="text-text-secondary shrink-0 text-xs">
- {localize('com_ui_queued_turn_starting')}
+ {(recoveryHeld || isRejected || isUnconfirmed || isIndeterminate) && (
+ <span
+ className="text-text-warning shrink-0 text-xs"
+ title={recoveryHeld ? localize('com_ui_steer_recovery_review') : undefined}
+ >
+ {localize(statusLabel)}
</span>
)}
{showPrimary && (
diff --git a/client/src/components/Chat/Menus/Endpoints/components/VirtualizedModelList.tsx b/client/src/components/Chat/Menus/Endpoints/components/VirtualizedModelList.tsx
index e6f4f15743..678f8f6c51 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/VirtualizedModelList.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/VirtualizedModelList.tsx
@@ -170,7 +170,6 @@ export default function VirtualizedModelList({
overscanRowCount={OVERSCAN}
rowRenderer={rowRenderer}
className="outline-hidden!"
- style={{ width: '100%' }}
/**
* `List` spreads its props onto the underlying `Grid`, whose defaults are
* `role="grid"`, `containerRole="row"` and `tabIndex={0}`. Left alone, that puts a
diff --git a/client/src/components/Chat/Messages/PendingTurn.tsx b/client/src/components/Chat/Messages/PendingTurn.tsx
index 6a977cdf23..2fa0106dc4 100644
--- a/client/src/components/Chat/Messages/PendingTurn.tsx
+++ b/client/src/components/Chat/Messages/PendingTurn.tsx
@@ -108,7 +108,7 @@ export default function PendingTurn({
return (
<div
ref={rowRef}
- className="w-full border-0 bg-transparent text-text-primary"
+ className="text-text-primary w-full border-0 bg-transparent"
data-testid="pending-turn"
>
<div className="m-auto justify-center px-4 py-3 sm:px-0">
@@ -124,7 +124,7 @@ export default function PendingTurn({
<SubRow
classes={cn(messageFooterClasses, 'flex-wrap items-center justify-end gap-1.5')}
>
- <span className="text-xs text-text-secondary" role="status">
+ <span className="text-text-secondary text-xs" role="status">
{localize('com_ui_queued_turn_starting')}
</span>
<span ref={setActionsTarget} className="flex items-center gap-1" />
@@ -134,7 +134,7 @@ export default function PendingTurn({
<Container message={message}>
<div
className={cn(
- 'markdown prose message-content dark:prose-invert light w-full break-words text-text-primary',
+ 'markdown prose message-content dark:prose-invert light text-text-primary w-full break-words',
!enableUserMsgMarkdown && 'whitespace-pre-wrap',
)}
>
diff --git a/client/src/components/Chat/Subagents/SubagentActivity.tsx b/client/src/components/Chat/Subagents/SubagentActivity.tsx
index 3fe1175da8..58c08de893 100644
--- a/client/src/components/Chat/Subagents/SubagentActivity.tsx
+++ b/client/src/components/Chat/Subagents/SubagentActivity.tsx
@@ -80,10 +80,12 @@ function SubagentControlHistory({
key={control.invocationId}
className="border-border-light bg-surface-secondary rounded-lg border px-3 py-2 text-sm"
>
- <div className="flex items-center gap-2">
+ <div className="flex flex-wrap items-center gap-2">
<StatusIcon size={14} aria-hidden className="text-text-secondary shrink-0" />
- <span className="font-medium">{localize(CONTROL_ACTION_LABELS[control.action])}</span>
- <span className="text-text-secondary ml-auto text-xs" aria-live="polite">
+ <span className="min-w-0 flex-1 font-medium">
+ {localize(CONTROL_ACTION_LABELS[control.action])}
+ </span>
+ <span className="text-text-secondary ml-auto shrink-0 text-xs" aria-live="polite">
{localize(CONTROL_STATUS_LABELS[control.status])}
</span>
{control.status === 'accepted' &&
diff --git a/client/src/components/SidePanel/Agents/Code/Settings.tsx b/client/src/components/SidePanel/Agents/Code/Settings.tsx
index fb1d973e2f..2585d2b6d6 100644
--- a/client/src/components/SidePanel/Agents/Code/Settings.tsx
+++ b/client/src/components/SidePanel/Agents/Code/Settings.tsx
@@ -142,17 +142,17 @@ export default function CodeSettings() {
<HoverCard openDelay={50}>
<div className="flex items-center justify-between">
<div className="flex items-center space-x-2">
- <div className={codeEnabled ? 'text-sm' : 'text-sm text-text-tertiary'}>
+ <div className={codeEnabled ? 'text-sm' : 'text-text-tertiary text-sm'}>
{localize('com_ui_stateful_sessions')}
</div>
<HoverCardTrigger>
- <CircleHelpIcon className="h-4 w-4 text-text-tertiary" />
+ <CircleHelpIcon className="text-text-tertiary h-4 w-4" />
</HoverCardTrigger>
</div>
<HoverCardPortal>
<HoverCardContent side={ESide.Top} className="w-80">
<div className="space-y-2">
- <p className="text-sm text-text-secondary">
+ <p className="text-text-secondary text-sm">
{localize('com_nav_info_stateful_sessions')}
</p>
</div>
@@ -174,7 +174,7 @@ export default function CodeSettings() {
{executionEnvironments.length > 0 && (
<>
<label
- className="text-xs font-medium text-text-secondary"
+ className="text-text-secondary text-xs font-medium"
htmlFor="code-environment-id"
>
{localize('com_ui_code_environment')}
@@ -207,13 +207,13 @@ export default function CodeSettings() {
))}
</SelectContent>
</Select>
- <p className="text-xs text-text-tertiary">
+ <p className="text-text-tertiary text-xs">
{localize('com_nav_info_code_environment')}
</p>
</>
)}
<label
- className="text-xs font-medium text-text-secondary"
+ className="text-text-secondary text-xs font-medium"
htmlFor="stateful-code-environment"
>
{localize('com_ui_stateful_code_environment')}
@@ -244,14 +244,14 @@ export default function CodeSettings() {
))}
</SelectContent>
</Select>
- <p className="text-xs text-text-tertiary">
+ <p className="text-text-tertiary text-xs">
{localize('com_nav_info_stateful_code_environment')}
</p>
{showGitIdentity && (
<div className="space-y-2">
<label
htmlFor="code-workspace-default"
- className="text-xs font-medium text-text-secondary"
+ className="text-text-secondary text-xs font-medium"
>
{localize('com_ui_code_workspace_default')}
</label>
@@ -297,20 +297,20 @@ export default function CodeSettings() {
</SelectContent>
</Select>
{workspaceDiscoveryState !== 'ready' && (
- <p className="text-xs text-text-tertiary" role="status">
+ <p className="text-text-tertiary text-xs" role="status">
{localize(WORKSPACE_STATUS_LABELS[workspaceDiscoveryState])}
</p>
)}
- <p className="text-xs text-text-tertiary">
+ <p className="text-text-tertiary text-xs">
{localize('com_ui_code_workspace_default_description')}
</p>
</div>
)}
{showGitIdentity && (
- <div className="space-y-2 border-t border-border-light pt-3">
+ <div className="border-border-light space-y-2 border-t pt-3">
<label
htmlFor="repository-instructions"
- className="text-xs font-medium text-text-secondary"
+ className="text-text-secondary text-xs font-medium"
>
{localize('com_ui_repository_instructions')}
</label>
@@ -336,10 +336,10 @@ export default function CodeSettings() {
</SelectItem>
</SelectContent>
</Select>
- <p className="text-xs text-text-tertiary">
+ <p className="text-text-tertiary text-xs">
{localize('com_ui_repository_instructions_description')}
</p>
- <div className="text-xs font-medium text-text-secondary">
+ <div className="text-text-secondary text-xs font-medium">
{localize('com_ui_agent_git_identity')}
</div>
<Input
@@ -363,11 +363,11 @@ export default function CodeSettings() {
aria-label={localize('com_ui_agent_git_email')}
/>
{(errors.git_identity?.name || errors.git_identity?.email) && (
- <p className="text-xs text-text-destructive" role="alert">
+ <p className="text-text-destructive text-xs" role="alert">
{localize('com_ui_agent_git_identity_both_required')}
</p>
)}
- <p className="text-xs text-text-tertiary">
+ <p className="text-text-tertiary text-xs">
{localize('com_nav_info_agent_git_identity')}
</p>
</div>
diff --git a/client/src/hooks/SSE/__tests__/workspace.spec.tsx b/client/src/hooks/SSE/__tests__/workspace.spec.tsx
index 69f7f24db4..5d6c175e17 100644
--- a/client/src/hooks/SSE/__tests__/workspace.spec.tsx
+++ b/client/src/hooks/SSE/__tests__/workspace.spec.tsx
@@ -5,7 +5,7 @@ import { MemoryRouter } from 'react-router-dom';
import { act, renderHook } from '@testing-library/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { Constants, EModelEndpoint, QueryKeys } from 'librechat-data-provider';
-import type { EventSubmission, TConversation } from 'librechat-data-provider';
+import type { ChatCreatedFrame, EventSubmission, TConversation } from 'librechat-data-provider';
import useCodeWorkspace from '~/hooks/Agents/useCodeWorkspace';
import useEventHandlers from '../useEventHandlers';
@@ -123,10 +123,9 @@ function setup(current = initialConversation, isAddedRequest = false) {
current.codeEnvironmentMode,
),
};
- const createdData = {
- conversation: current,
- requestMessage: submission.userMessage,
- responseMessage: submission.initialResponse,
+ const createdData: ChatCreatedFrame = {
+ created: true,
+ message: submission.userMessage,
};
return { ...hook, submission, createdData, queryClient };
}
diff --git a/packages/api/src/mcp/__tests__/MCPConnectionFactory.oauthSdk.integration.test.ts b/packages/api/src/mcp/__tests__/MCPConnectionFactory.oauthSdk.integration.test.ts
index fb109abd33..7b1ef720ec 100644
--- a/packages/api/src/mcp/__tests__/MCPConnectionFactory.oauthSdk.integration.test.ts
+++ b/packages/api/src/mcp/__tests__/MCPConnectionFactory.oauthSdk.integration.test.ts
@@ -219,6 +219,7 @@ describe('MCPConnectionFactory OAuth against real SDK Streamable HTTP server', (
tokenMethods: {
findToken: tokenStore.findToken,
createToken: tokenStore.createToken,
+ replaceTokenIfCurrent: jest.fn(),
updateToken: tokenStore.updateToken,
deleteTokens: tokenStore.deleteTokens,
},
@@ -242,6 +243,7 @@ describe('MCPConnectionFactory OAuth against real SDK Streamable HTTP server', (
const tokenMethods = {
findToken: tokenStore.findToken,
createToken: tokenStore.createToken,
+ replaceTokenIfCurrent: jest.fn(),
updateToken: tokenStore.updateToken,
deleteTokens: tokenStore.deleteTokens,
};
diff --git a/packages/api/src/mcp/__tests__/MCPConnectionFactory.test.ts b/packages/api/src/mcp/__tests__/MCPConnectionFactory.test.ts
index f2eb103875..a9893fbea8 100644
--- a/packages/api/src/mcp/__tests__/MCPConnectionFactory.test.ts
+++ b/packages/api/src/mcp/__tests__/MCPConnectionFactory.test.ts
@@ -4929,6 +4929,7 @@ describe('MCPConnectionFactory', () => {
tokenMethods: {
findToken: jest.fn(),
createToken: jest.fn(),
+ replaceTokenIfCurrent: jest.fn(),
updateToken: jest.fn(),
deleteTokens: jest.fn(),
},
diff --git a/packages/client/src/components/ControlCombobox.tsx b/packages/client/src/components/ControlCombobox.tsx
index e082a49e0e..74297ec776 100644
--- a/packages/client/src/components/ControlCombobox.tsx
+++ b/packages/client/src/components/ControlCombobox.tsx
@@ -91,6 +91,7 @@ function ControlCombobox({
const [searchValue, setSearchValue] = useState('');
const buttonRef = useRef<HTMLButtonElement>(null);
const [buttonWidth, setButtonWidth] = useState<number | null>(null);
+ const popoverWidth = isCollapsed ? '300px' : (buttonWidth ?? '300px');
const popoverZIndex = usePopoverZIndex();
const getItem = (option: OptionWithIcon) => ({
@@ -228,6 +229,7 @@ function ControlCombobox({
portal={portal}
className={cn(
'border-border-light bg-surface-secondary overflow-hidden rounded-xl border shadow-lg',
+ popoverMaxHeight != null && 'flex flex-col',
popoverClassName ?? 'animate-popover',
)}
style={{
@@ -236,24 +238,22 @@ function ControlCombobox({
* placement, so a short viewport shrinks the cap instead of pushing
* lower options offscreen; the fallback keeps the cap when the
* variable is absent. */
- ...(popoverMaxHeight != null
- ? {
- maxHeight: `min(${popoverMaxHeight}px, var(--popover-available-height, ${popoverMaxHeight}px))`,
- }
- : null),
- ...(matchTriggerWidth
- ? { width: isCollapsed ? '300px' : (buttonWidth ?? '300px') }
- : { minWidth: '16rem' }),
+ maxHeight:
+ popoverMaxHeight != null
+ ? `min(${popoverMaxHeight}px, var(--popover-available-height, ${popoverMaxHeight}px))`
+ : undefined,
+ width: matchTriggerWidth ? popoverWidth : undefined,
+ minWidth: matchTriggerWidth ? undefined : '16rem',
}}
>
<div className="shrink-0 py-1.5">
<div className="relative">
- <Search className="text-text-primary absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2" />
+ <Search className="text-text-primary absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2" />
<Ariakit.Combobox
store={combobox}
autoSelect
placeholder={searchPlaceholder}
- className="bg-surface-secondary text-text-primary w-full rounded-md py-2 pr-3 pl-9 text-sm focus:outline-hidden"
+ className="bg-surface-secondary text-text-primary focus:outline-hidden w-full rounded-md py-2 pl-9 pr-3 text-sm"
/>
</div>
</div>