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

🛶 style: Match CI Tailwind Formatting in Canary Sync

Lia57e26fae4443
diff --git a/client/src/components/Chat/BackgroundTasks/Button.tsx b/client/src/components/Chat/BackgroundTasks/Button.tsx
index 2c601bd9a8..d6b102a1dc 100644
--- a/client/src/components/Chat/BackgroundTasks/Button.tsx
+++ b/client/src/components/Chat/BackgroundTasks/Button.tsx
@@ -109,7 +109,7 @@ function BackgroundTasksButton({
{(activeCount > 0 || awaitingCount > 0 || failedCount > 0 || incomplete) && (
<span
aria-hidden="true"
- 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"
+ className="bg-status-info ring-presentation absolute -top-0.5 -right-0.5 size-2 animate-pulse rounded-full ring-2 motion-reduce:animate-none"
/>
)}
</Ariakit.PopoverDisclosure>
@@ -128,7 +128,7 @@ function BackgroundTasksButton({
wide ? 'w-[36rem]' : 'w-80',
)}
>
- <div className="flex items-center gap-1 px-3 pb-2 pt-3">
+ <div className="flex items-center gap-1 px-3 pt-3 pb-2">
<Ariakit.PopoverHeading className="flex-1 text-sm font-semibold">
{title}
</Ariakit.PopoverHeading>
diff --git a/client/src/components/Chat/BackgroundTasks/Card.tsx b/client/src/components/Chat/BackgroundTasks/Card.tsx
index 26528bc440..65ed9fadd0 100644
--- a/client/src/components/Chat/BackgroundTasks/Card.tsx
+++ b/client/src/components/Chat/BackgroundTasks/Card.tsx
@@ -72,7 +72,7 @@ function TaskCard({
aria-expanded={open}
aria-controls={detailId}
onClick={() => setOpen((value) => !value)}
- 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"
+ className="text-text-primary focus-visible:ring-ring-primary flex max-w-full items-start gap-1 rounded text-left text-sm focus-visible:ring-2 focus-visible:outline-none"
>
<span className="line-clamp-2 break-words">{title}</span>
<ChevronDown
@@ -84,7 +84,7 @@ function TaskCard({
/>
</button>
) : (
- <p className="text-text-primary line-clamp-2 break-words text-sm">{title}</p>
+ <p className="text-text-primary line-clamp-2 text-sm break-words">{title}</p>
)}
<p className="text-text-secondary mt-0.5 flex items-center gap-2 text-xs">
{title !== kindLabel && <span className="font-medium">{kindLabel}</span>}
@@ -122,7 +122,7 @@ function TaskCard({
aria-label={`${stopLabel}: ${title}`}
disabled={isStopping}
onClick={() => onStop(row)}
- 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"
+ 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:ring-2 focus-visible:outline-none disabled:opacity-50"
>
<Square className="size-3" aria-hidden="true" />
</button>
@@ -134,7 +134,7 @@ function TaskCard({
{expandable && open && (
<pre
id={detailId}
- 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"
+ className="bg-surface-primary text-text-primary mt-2 max-h-48 overflow-auto rounded-md p-2 font-mono text-xs break-words whitespace-pre-wrap"
>
{row.detail}
</pre>
diff --git a/client/src/components/Chat/BackgroundTasks/Section.tsx b/client/src/components/Chat/BackgroundTasks/Section.tsx
index 072e31430e..453e7c9269 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="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"
+ 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:ring-2 focus-visible:outline-none"
>
<span>{label}</span>
<span className="tabular-nums">{count}</span>
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index 1be3644fc8..3676a2a272 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 pb-4 pt-1',
+ 'border-border-light bg-surface-secondary border px-2 pt-1 pb-4',
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. */
- 'relative flex w-full grow flex-col overflow-hidden rounded-t-theme-surface-lg sm:rounded-theme-surface-lg',
+ 'rounded-t-theme-surface-lg sm:rounded-theme-surface-lg relative flex w-full grow flex-col overflow-hidden',
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 pr-2.5 pt-1.5">
+ <div className="flex flex-col items-start justify-start pt-1.5 pr-2.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 93a19660e2..79bea04a98 100644
--- a/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx
+++ b/client/src/components/Chat/Input/CodeWorkspaceMenu.tsx
@@ -333,14 +333,16 @@ export default function CodeWorkspaceMenu({
<button
type="button"
data-testid="code-workspace-locked-status"
- role="status"
- aria-label={`${label}. ${recovery}`}
- className={cn(composerControlClasses(), 'max-w-full min-w-0 cursor-default px-2.5')}
+ disabled={disabled || isRefreshing}
+ onClick={() => void refresh()}
+ aria-label={`${label}. ${recovery}. ${localize('com_ui_retry')}`}
+ aria-busy={isRefreshing}
+ className={cn(composerControlClasses(), 'max-w-full min-w-0 px-2.5')}
/>
}
>
<Icon className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
- <span role="status" className="min-w-0 max-w-[16rem] truncate">
+ <span role="status" className="max-w-[16rem] min-w-0 truncate">
{label}
</span>
<RefreshCw className="text-text-secondary size-3 shrink-0" aria-hidden="true" />
@@ -372,7 +374,7 @@ export default function CodeWorkspaceMenu({
}
className={cn(
composerControlClasses(),
- 'min-w-0 max-w-full px-2.5 md:px-theme-normal',
+ 'md:px-theme-normal max-w-full min-w-0 px-2.5',
isOpen && 'bg-surface-hover',
buttonDisabled && 'cursor-not-allowed opacity-50',
)}
@@ -380,7 +382,7 @@ export default function CodeWorkspaceMenu({
}
>
<ButtonIcon className="text-text-secondary size-4 shrink-0" aria-hidden="true" />
- <span className="min-w-0 max-w-[12rem] truncate">{buttonLabel}</span>
+ <span className="max-w-[12rem] min-w-0 truncate">{buttonLabel}</span>
<ChevronDown
className={cn(
'text-text-secondary size-3 shrink-0 transition-transform',
@@ -394,7 +396,7 @@ export default function CodeWorkspaceMenu({
gutter={8}
unmountOnHide={true}
className={cn(
- 'z-50 flex min-w-[280px] max-w-[min(360px,calc(100vw-2rem))] flex-col rounded-xl',
+ 'z-50 flex max-w-[min(360px,calc(100vw-2rem))] min-w-[280px] 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',
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index c1f802edd9..9117aecf48 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -2391,11 +2391,6 @@
"count": 2
}
},
- "packages/client/src/components/ControlCombobox.tsx": {
- "shadcn/no-inline-styles": {
- "count": 1
- }
- },
"packages/client/src/components/DataTable.tsx": {
"shadcn/no-inline-styles": {
"count": 6
diff --git a/packages/client/src/components/ControlCombobox.tsx b/packages/client/src/components/ControlCombobox.tsx
index 74297ec776..48fdf54430 100644
--- a/packages/client/src/components/ControlCombobox.tsx
+++ b/packages/client/src/components/ControlCombobox.tsx
@@ -248,12 +248,12 @@ function ControlCombobox({
>
<div className="shrink-0 py-1.5">
<div className="relative">
- <Search className="text-text-primary absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2" />
+ <Search className="text-text-primary absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2" />
<Ariakit.Combobox
store={combobox}
autoSelect
placeholder={searchPlaceholder}
- className="bg-surface-secondary text-text-primary focus:outline-hidden w-full rounded-md py-2 pl-9 pr-3 text-sm"
+ className="bg-surface-secondary text-text-primary w-full rounded-md py-2 pr-3 pl-9 text-sm focus:outline-hidden"
/>
</div>
</div>