Skip to content

LLM inference in C/C++

C++ ggml

ui: ESLint config updates (#27700)

Aleksander Grygierf1357e49980f
diff --git a/tools/ui/eslint.config.js b/tools/ui/eslint.config.js
index 6ad065f5a0..9eab1734c3 100644
--- a/tools/ui/eslint.config.js
+++ b/tools/ui/eslint.config.js
@@ -12,6 +12,107 @@ import { fileURLToPath } from 'node:url';
import ts from 'typescript-eslint';
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
+// Require a blank line between sibling element-like nodes in a Svelte template
+// (elements, components, and the {#if} / {#each} / {#await} / {#snippet} /
+// {@render} blocks) that sit on separate lines at the same nesting level.
+// Whitespace between siblings is a whitespace-only SvelteText node; when it
+// holds a single newline (no blank line) the fix adds one, keeping the
+// indentation of the second sibling. Real text content (e.g. `foo\n\nbar`)
+// is left alone.
+const ELEMENT_LIKE_TYPES = new Set([
+ 'SvelteAwaitBlock',
+ 'SvelteComponent',
+ 'SvelteEachBlock',
+ 'SvelteElement',
+ 'SvelteIfBlock',
+ 'SvelteKeyBlock',
+ 'SvelteRenderTag',
+ 'SvelteSelf',
+ 'SvelteSnippetBlock'
+]);
+const paddingLineBetweenElements = {
+ create(context) {
+ // Check one list of template children. Each children array holds the
+ // element-like nodes plus the whitespace/comment text between them.
+ function checkChildren(children) {
+ if (!Array.isArray(children)) return;
+
+ let lastElement = null;
+ let lastWhitespace = null;
+
+ for (const child of children) {
+ if (child.type === 'SvelteText' && /^\s*$/.test(child.value)) {
+ lastWhitespace = child;
+
+ continue;
+ }
+
+ if (!ELEMENT_LIKE_TYPES.has(child.type)) continue;
+
+ if (
+ lastElement &&
+ lastWhitespace &&
+ child.loc.start.line - lastElement.loc.end.line === 1
+ ) {
+ const textNode = lastWhitespace;
+
+ context.report({
+ fix(fixer) {
+ // Add a second newline so the two siblings are separated by a
+ // blank line, keeping the trailing indentation.
+ return fixer.replaceText(textNode, textNode.value.replace(/\n/, '\n\n'));
+ },
+ message: 'Expected a blank line between sibling elements.',
+ node: child
+ });
+ }
+
+ lastElement = child;
+ lastWhitespace = null;
+ }
+ }
+
+ return {
+ SvelteAwaitBlock(node) {
+ checkChildren(node.children);
+ checkChildren(node.then?.children);
+ checkChildren(node.else?.children);
+ },
+ SvelteComponent(node) {
+ checkChildren(node.children);
+ },
+ SvelteEachBlock(node) {
+ checkChildren(node.children);
+ checkChildren(node.else?.children);
+ },
+ SvelteElement(node) {
+ checkChildren(node.children);
+ },
+ SvelteFragment(node) {
+ checkChildren(node.children);
+ },
+ SvelteIfBlock(node) {
+ checkChildren(node.children);
+ checkChildren(node.else?.children);
+ },
+ SvelteKeyBlock(node) {
+ checkChildren(node.children);
+ },
+ SvelteProgram(node) {
+ checkChildren(node.children);
+ },
+ SvelteSnippetBlock(node) {
+ checkChildren(node.children);
+ }
+ };
+ },
+ meta: {
+ docs: { description: 'Require a blank line between sibling elements in a Svelte template.' },
+ fixable: 'whitespace',
+ schema: [],
+ type: 'layout'
+ }
+};
// Require a blank line between consecutive class accessors (get/set). The core
// `padding-line-between-statements` rule only handles statements, not class
// members, so this is enforced with a small custom rule.
@@ -66,7 +167,12 @@ export default ts.config(
{
languageOptions: { globals: { ...globals.browser, ...globals.node } },
plugins: {
- local: { rules: { 'blank-line-between-accessors': blankLineBetweenAccessors } },
+ local: {
+ rules: {
+ 'blank-line-between-accessors': blankLineBetweenAccessors,
+ 'padding-line-between-elements': paddingLineBetweenElements
+ }
+ },
perfectionist,
'simple-import-sort': simpleImportSort
},
@@ -82,6 +188,8 @@ export default ts.config(
'eol-last': 'error',
// Enforce a blank line between consecutive get/set accessors
'local/blank-line-between-accessors': 'error',
+ // Require a blank line between sibling elements in a Svelte template
+ 'local/padding-line-between-elements': 'error',
// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
'no-undef': 'off',
@@ -156,9 +264,49 @@ export default ts.config(
// grouping); Prettier normalizes comma spacing afterwards.
'simple-import-sort/imports': ['error', { groups: [['.*']] }],
'svelte/no-at-html-tags': 'off',
-
// This app uses hash-based routing (#/) where resolve() from $app/paths does not apply
- 'svelte/no-navigation-without-resolve': 'off'
+ 'svelte/no-navigation-without-resolve': 'off',
+
+ // Sort HTML attributes alphabetically in the markup. The Svelte directives
+ // (bind:/use:/animate:/style:/in:/out:/transition:/class:) sort first,
+ // alphabetically among themselves, then all remaining attributes sort
+ // alphabetically. The rule keeps spread attributes in place and does not cross
+ // them. `this` stays first on <svelte:element> because Prettier forces it there
+ // - reordering it alphabetically would fight the formatter.
+ 'svelte/sort-attributes': [
+ 'error',
+ {
+ order: [
+ 'this',
+ {
+ match: [
+ '/^bind:/u',
+ '/^use:/u',
+ '/^animate:/u',
+ '/^style:/u',
+ '/^in:/u',
+ '/^out:/u',
+ '/^transition:/u',
+ '/^class:/u'
+ ],
+ sort: 'alphabetical'
+ },
+ {
+ match: [
+ '!/^bind:/u',
+ '!/^use:/u',
+ '!/^animate:/u',
+ '!/^style:/u',
+ '!/^in:/u',
+ '!/^out:/u',
+ '!/^transition:/u',
+ '!/^class:/u'
+ ],
+ sort: 'alphabetical'
+ }
+ ]
+ }
+ ]
}
},
{
diff --git a/tools/ui/src/lib/components/app/actions/ActionIcon.svelte b/tools/ui/src/lib/components/app/actions/ActionIcon.svelte
index e29b5ad67d..0ed22d932c 100644
--- a/tools/ui/src/lib/components/app/actions/ActionIcon.svelte
+++ b/tools/ui/src/lib/components/app/actions/ActionIcon.svelte
@@ -41,17 +41,17 @@
{#snippet button(props = {})}
<Button
{...props}
- {href}
- {variant}
- {size}
+ aria-label={ariaLabel || tooltip}
+ class="h-6 w-6 p-0 {className} flex hover:bg-transparent data-[state=open]:bg-transparent!"
{disabled}
+ {href}
onclick={(e: MouseEvent) => {
if (stopPropagationOnClick) e.stopPropagation();
onclick?.(e);
}}
- class="h-6 w-6 p-0 {className} flex hover:bg-transparent data-[state=open]:bg-transparent!"
- aria-label={ariaLabel || tooltip}
+ {size}
+ {variant}
>
{#if icon}
{@const IconComponent = icon}
diff --git a/tools/ui/src/lib/components/app/actions/ActionIconCopyToClipboard.svelte b/tools/ui/src/lib/components/app/actions/ActionIconCopyToClipboard.svelte
index 2d54df89d6..f4dc669392 100644
--- a/tools/ui/src/lib/components/app/actions/ActionIconCopyToClipboard.svelte
+++ b/tools/ui/src/lib/components/app/actions/ActionIconCopyToClipboard.svelte
@@ -10,9 +10,9 @@
</script>
<ActionIcon
+ disabled={!canCopy}
icon={Copy}
- tooltip={ariaLabel}
iconSize={ICON_CLASS_DEFAULT}
- disabled={!canCopy}
onclick={() => canCopy && copyToClipboard(text)}
+ tooltip={ariaLabel}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsList.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsList.svelte
index 2de9460aa7..77218fe168 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsList.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsList.svelte
@@ -108,13 +108,13 @@
{/if}
<DialogChatAttachmentsPreview
+ bind:open={viewAllDialogOpen}
{activeModelId}
{attachments}
- bind:open={viewAllDialogOpen}
{previewFocusIndex}
{uploadedFiles}
/>
{#if mcpResourcePreviewExtra}
- <DialogMcpResourcePreview extra={mcpResourcePreviewExtra} bind:open={mcpResourcePreviewOpen} />
+ <DialogMcpResourcePreview bind:open={mcpResourcePreviewOpen} extra={mcpResourcePreviewExtra} />
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItem.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItem.svelte
index ba06e18159..05bd733a2c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItem.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItem.svelte
@@ -75,58 +75,58 @@
{#if mcpPrompt}
<ChatAttachmentsListItemMcpPrompt
class="max-w-[300px] min-w-[200px] flex-shrink-0 {className} {scrollClasses}"
- prompt={mcpPrompt}
- {readonly}
isLoading={item.isLoading}
loadError={item.loadError}
onRemove={onFileRemove ? () => onFileRemove(item.id) : undefined}
+ prompt={mcpPrompt}
+ {readonly}
/>
{/if}
{:else if isMcpResource(item)}
{@const mcpResource = item.attachment as DatabaseMessageExtraMcpResource}
<ChatAttachmentsListItemMcpResource
- class="flex-shrink-0 {className} {scrollClasses}"
attachment={toMcpResourceAttachment(mcpResource, item.id)}
+ class="flex-shrink-0 {className} {scrollClasses}"
onclick={() => onMcpResourcePreview?.(mcpResource)}
/>
{:else if item.isImage && item.preview}
<ChatAttachmentsListItemThumbnailImage
class="flex-shrink-0 cursor-pointer {className} {scrollClasses}"
+ height={imageHeight}
id={item.id}
+ {imageClass}
name={item.name}
+ onRemove={onFileRemove}
+ onclick={() => onPreview?.(item)}
preview={item.preview}
{readonly}
- onRemove={onFileRemove}
- height={imageHeight}
width={imageWidth}
- {imageClass}
- onclick={() => onPreview?.(item)}
/>
{:else if isPdfFile(item.attachment, item.uploadedFile)}
<ChatAttachmentsListItemThumbnailFile
+ attachment={item.attachment}
class="flex-shrink-0 cursor-pointer {className} {scrollClasses}"
id={item.id}
name={item.name}
- size={item.size}
- {readonly}
onRemove={onFileRemove}
+ onclick={() => onPreview?.(item)}
+ {readonly}
+ size={item.size}
textContent={item.textContent}
- attachment={item.attachment}
uploadedFile={item.uploadedFile}
- onclick={() => onPreview?.(item)}
/>
{:else}
<ChatAttachmentsListItemThumbnailFile
+ attachment={item.attachment}
class="flex-shrink-0 cursor-pointer {className} {scrollClasses}"
id={item.id}
name={item.name}
- size={item.size}
- {readonly}
onRemove={onFileRemove}
+ onclick={() => onPreview?.(item)}
+ {readonly}
+ size={item.size}
textContent={item.textContent}
- attachment={item.attachment}
uploadedFile={item.uploadedFile}
- onclick={() => onPreview?.(item)}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemMcpPrompt.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemMcpPrompt.svelte
index f5452aade2..2fee5cf40e 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemMcpPrompt.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemMcpPrompt.svelte
@@ -35,7 +35,7 @@
<div
class="absolute top-10 right-2 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100"
>
- <ActionIcon icon={X} tooltip="Remove" stopPropagationOnClick onclick={() => onRemove?.()} />
+ <ActionIcon icon={X} onclick={() => onRemove?.()} stopPropagationOnClick tooltip="Remove" />
</div>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailFile.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailFile.svelte
index abdba0e2e0..409a3a0f4a 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailFile.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailFile.svelte
@@ -101,7 +101,7 @@
<div
class="absolute top-2 right-2 opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100"
>
- <ActionIcon icon={X} tooltip="Remove" stopPropagationOnClick onclick={() => onRemove?.(id)} />
+ <ActionIcon icon={X} onclick={() => onRemove?.(id)} stopPropagationOnClick tooltip="Remove" />
</div>
{/snippet}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailImage.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailImage.svelte
index a71e23a836..34db433392 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailImage.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList/ChatAttachmentsListItem/ChatAttachmentsListItemThumbnailImage.svelte
@@ -30,7 +30,7 @@
</script>
{#snippet image()}
- <img src={preview} alt={name} class="{height} {width} cursor-pointer object-cover {imageClass}" />
+ <img alt={name} class="{height} {width} cursor-pointer object-cover {imageClass}" src={preview} />
{/snippet}
<div
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte
index 304e5a6009..efcf1975c2 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte
@@ -185,30 +185,30 @@
<div class="{className} flex flex-col text-white">
<div class="relative flex min-h-0 flex-1 items-center justify-center overflow-hidden">
- <ChatAttachmentsPreviewNavButtons onPrev={prev} onNext={next} show={allItems.length > 1} />
+ <ChatAttachmentsPreviewNavButtons onNext={next} onPrev={prev} show={allItems.length > 1} />
<div class="flex h-full w-full flex-col items-center justify-start overflow-auto py-4">
{#if currentItem}
<ChatAttachmentsPreviewFileInfo {displayName} {fileSize} />
<ChatAttachmentsPreviewCurrentItem
+ {activeModelId}
+ {audioSrc}
{currentItem}
- {isImage}
+ {displayPreview}
+ {displayTextContent}
+ {hasVisionModality}
{isAudio}
- {isVideo}
+ {isImage}
{isPdf}
{isText}
- {displayPreview}
- {displayTextContent}
- {audioSrc}
- {videoSrc}
+ {isVideo}
{language}
- {hasVisionModality}
- {activeModelId}
+ {videoSrc}
/>
{/if}
- <ChatAttachmentsPreviewThumbnailStrip items={allItems} {currentIndex} {onNavigate} />
+ <ChatAttachmentsPreviewThumbnailStrip {currentIndex} items={allItems} {onNavigate} />
</div>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItem.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItem.svelte
index c0d7cbd30d..eabfe2f1ae 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItem.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItem.svelte
@@ -53,18 +53,18 @@
{#key currentItem.id}
{#if isPdf}
<ChatAttachmentsPreviewCurrentItemPdf
+ {activeModelId}
{currentItem}
displayName={currentItem.name}
{displayTextContent}
{hasVisionModality}
- {activeModelId}
/>
{:else if isImage}
<ChatAttachmentsPreviewCurrentItemImage {currentItem} {displayPreview} />
{:else if isText && displayTextContent}
<ChatAttachmentsPreviewCurrentItemText {displayTextContent} {language} />
{:else if isAudio}
- <ChatAttachmentsPreviewCurrentItemAudio {currentItem} {audioSrc} />
+ <ChatAttachmentsPreviewCurrentItemAudio {audioSrc} {currentItem} />
{:else if isVideo}
<ChatAttachmentsPreviewCurrentItemVideo {currentItem} {videoSrc} />
{:else if isUnavailable}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemAudio.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemAudio.svelte
index ace69b8181..90392c9570 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemAudio.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemAudio.svelte
@@ -14,7 +14,7 @@
<Music class="mx-auto mb-4 h-16 w-16 text-white/50" />
{#if audioSrc}
- <audio controls class="mb-4 w-full" src={audioSrc}>
+ <audio class="mb-4 w-full" controls src={audioSrc}>
Your browser does not support the audio element.
</audio>
{:else}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemImage.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemImage.svelte
index 070ff82301..155fad87b4 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemImage.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemImage.svelte
@@ -10,9 +10,9 @@
{#if displayPreview}
<div class="flex flex-1 items-center justify-center">
<img
- src={displayPreview}
alt={currentItem?.name || 'preview'}
class="max-h-[80vh] max-w-[80vw] rounded-lg object-contain shadow-lg"
+ src={displayPreview}
/>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemPdf.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemPdf.svelte
index 4be156edba..6b7fad627c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemPdf.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemPdf.svelte
@@ -87,20 +87,20 @@
<div class="mb-4 flex items-center justify-end gap-2">
<Button
- variant={pdfViewMode === PdfViewMode.TEXT ? 'default' : 'outline'}
- size="sm"
- onclick={() => (pdfViewMode = PdfViewMode.TEXT)}
disabled={pdfImagesLoading}
+ onclick={() => (pdfViewMode = PdfViewMode.TEXT)}
+ size="sm"
+ variant={pdfViewMode === PdfViewMode.TEXT ? 'default' : 'outline'}
>
<FileText class="mr-1 {ICON_CLASS_DEFAULT}" />
Text
</Button>
<Button
- variant={pdfViewMode === PdfViewMode.PAGES ? 'default' : 'outline'}
- size="sm"
- onclick={() => (pdfViewMode = PdfViewMode.PAGES)}
disabled={pdfImagesLoading}
+ onclick={() => (pdfViewMode = PdfViewMode.PAGES)}
+ size="sm"
+ variant={pdfViewMode === PdfViewMode.PAGES ? 'default' : 'outline'}
>
{#if pdfImagesLoading}
<div
@@ -116,7 +116,9 @@
{#if !hasVisionModality && activeModelId && currentItem}
<Alert.Root class="mb-4 max-w-4xl">
<Info class={ICON_CLASS_DEFAULT} />
+
<Alert.Title>Preview only</Alert.Title>
+
<Alert.Description>
<span class="inline-flex">
The selected model does not support vision. Only the extracted
@@ -140,6 +142,7 @@
<div
class="mx-auto mb-4 h-8 w-8 animate-spin rounded-full border-4 border-white border-t-transparent"
></div>
+
<p class="text-white/70">Converting PDF to images...</p>
</div>
</div>
@@ -147,20 +150,25 @@
<div class="flex flex-1 items-center justify-center p-8">
<div class="text-center">
<FileText class="mx-auto mb-4 h-16 w-16 text-white/50" />
+
<p class="mb-4 text-white/70">Failed to load PDF images</p>
+
<p class="text-sm text-white/50">{pdfImagesError}</p>
</div>
</div>
{:else if pdfImages.length > 0}
{#each pdfImages as image, index (image)}
<p class="mb-2 text-sm text-white/50">Page {index + 1}</p>
- <img src={image} alt="PDF Page {index + 1}" class="mx-auto max-w-[85vw] rounded-lg shadow-lg" />
+
+ <img alt="PDF Page {index + 1}" class="mx-auto max-w-[85vw] rounded-lg shadow-lg" src={image} />
+
<div class="h-4"></div>
{/each}
{:else}
<div class="flex flex-1 items-center justify-center p-8">
<div class="text-center">
<FileText class="mx-auto mb-4 h-16 w-16 text-white/50" />
+
<p class="text-white/70">No PDF pages available</p>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemVideo.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemVideo.svelte
index 62040b36f9..ed3da1403c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemVideo.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewCurrentItem/ChatAttachmentsPreviewCurrentItemVideo.svelte
@@ -14,7 +14,7 @@
<Video class="mx-auto mb-4 h-16 w-16 text-white/50" />
{#if videoSrc}
- <video controls class="mb-4 w-full" src={videoSrc}>
+ <video class="mb-4 w-full" controls src={videoSrc}>
<track kind="captions" src="" />
Your browser does not support the video element.
</video>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewNavButtons.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewNavButtons.svelte
index 375a671687..9b0157030d 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewNavButtons.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewNavButtons.svelte
@@ -13,21 +13,21 @@
{#if show}
<Button
- variant="secondary"
- size="icon"
+ aria-label="Previous"
class="absolute top-1/2 left-4 z-10 h-8 w-8 -translate-y-1/2 rounded-full bg-background/5 p-0 text-white!"
onclick={onPrev}
- aria-label="Previous"
+ size="icon"
+ variant="secondary"
>
<ChevronLeft class="size-4" />
</Button>
<Button
- variant="secondary"
- size="icon"
+ aria-label="Next"
class="absolute top-1/2 right-4 z-10 h-8 w-8 -translate-y-1/2 rounded-full bg-background/5 p-0 text-white!"
onclick={onNext}
- aria-label="Next"
+ size="icon"
+ variant="secondary"
>
<ChevronRight class="size-4" />
</Button>
diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewThumbnailStrip.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewThumbnailStrip.svelte
index f0ea9675fb..e5ba09dba4 100644
--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewThumbnailStrip.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreviewThumbnailStrip.svelte
@@ -38,16 +38,16 @@
{#each items as item, index (item.id)}
<button
{...{ [UI_DATA_ATTRS.THUMBNAIL_INDEX]: index }}
+ aria-label={`Go to ${item.name}`}
class={[
'relative flex-shrink-0 cursor-pointer overflow-hidden rounded border-2 bg-black/80 backdrop-blur-sm transition-all hover:opacity-90',
index === currentIndex ? 'border-white' : 'border-transparent opacity-60',
'[&:not(:first-child)]:last:mr-4 [&:not(:last-child)]:first:ml-4'
]}
onclick={() => onNavigate(index)}
- aria-label={`Go to ${item.name}`}
>
{#if item.isImage && item.preview}
- <img src={item.preview} alt={item.name} class="h-12 w-12 object-cover" />
+ <img alt={item.name} class="h-12 w-12 object-cover" src={item.preview} />
{:else}
<div
class="bg-foreground-muted/50 flex h-12 w-12 flex-col items-center justify-center gap-0.5 py-1"
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte
index 18061728a2..9152935f07 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte
@@ -537,30 +537,30 @@
>
<ChatFormPickers
bind:this={pickersRef}
- isCommandPickerOpen={pickers.isCommandPickerOpen}
commandQuery={pickers.commandQuery}
commands={pickers.availableCommands}
- onCommandPickerClose={pickers.handleCommandPickerClose}
- onCommandSelect={pickers.handleCommandSelect}
- isPromptPickerOpen={pickers.isPromptPickerOpen}
- promptSearchQuery={pickers.promptSearchQuery}
+ isCommandPickerOpen={pickers.isCommandPickerOpen}
isMentionPickerOpen={pickers.isMentionPickerOpen}
- mentionQuery={pickers.mentionQuery}
+ isPromptPickerOpen={pickers.isPromptPickerOpen}
{mentionAnchor}
- scopePath={pickers.mentionScopePath}
- onPromptPickerClose={pickers.handlePromptPickerClose}
- onMentionPickerClose={pickers.handleMentionPickerClose}
+ mentionQuery={pickers.mentionQuery}
+ onCommandPickerClose={pickers.handleCommandPickerClose}
+ onCommandSelect={pickers.handleCommandSelect}
onMentionOpened={() => inputRef?.focus()}
+ onMentionPickerClose={pickers.handleMentionPickerClose}
onMentionSelect={handleMentionSelect}
- onPromptLoadStart={handlePromptLoadStart}
onPromptLoadComplete={handlePromptLoadComplete}
onPromptLoadError={handlePromptLoadError}
+ onPromptLoadStart={handlePromptLoadStart}
+ onPromptPickerClose={pickers.handlePromptPickerClose}
+ promptSearchQuery={pickers.promptSearchQuery}
+ scopePath={pickers.mentionScopePath}
/>
<div
bind:this={mentionAnchor}
- class="pointer-events-none absolute top-0 right-0 left-0 h-px"
aria-hidden="true"
+ class="pointer-events-none absolute top-0 right-0 left-0 h-px"
></div>
<div
@@ -570,29 +570,29 @@
data-slot="input-area"
>
<ChatAttachmentsList
- {attachments}
bind:uploadedFiles
- onFileRemove={handleFileRemove}
- limitToSingleRow
+ activeModelId={activeModelId ?? undefined}
+ {attachments}
class="py-5"
+ limitToSingleRow
+ onFileRemove={handleFileRemove}
style="scroll-padding: 1rem;"
- activeModelId={activeModelId ?? undefined}
/>
<div
class="flex-column relative min-h-12 items-center rounded-4xl md:rounded-3xl py-2 pb-2.25 shadow-sm transition-all focus-within:shadow-md md:py-3!"
>
<ChatFormInput
- class="px-5 py-1.5 md:pt-0"
bind:this={inputRef}
bind:value
- onKeydown={handleKeydown}
+ class="px-5 py-1.5 md:pt-0"
+ {disabled}
onInput={() => {
pickers.handleInput();
onValueChange?.(value);
}}
+ onKeydown={handleKeydown}
onPaste={handlePaste}
- {disabled}
{placeholder}
{useRichInput}
/>
@@ -608,22 +608,22 @@
{/if}
<ChatFormActions
- class="px-3"
bind:this={chatFormActionsRef}
canSend={canSubmit}
+ class="px-3"
{disabled}
{isLoading}
isReasoning={chatStore.isReasoning}
{isRecording}
- {showAddButton}
- {showModelSelector}
- {uploadedFiles}
onFileUpload={handleFileUpload}
+ onMcpPromptClick={showMcpPromptButton ? () => pickers.openPromptPicker() : undefined}
+ onMcpResourcesClick={() => (isResourceDialogOpen = true)}
onMicClick={handleMicClick}
{onStop}
onSystemPromptClick={() => onSystemPromptClick?.({ files: uploadedFiles, message: value })}
- onMcpPromptClick={showMcpPromptButton ? () => pickers.openPromptPicker() : undefined}
- onMcpResourcesClick={() => (isResourceDialogOpen = true)}
+ {showAddButton}
+ {showModelSelector}
+ {uploadedFiles}
/>
</div>
</div>
@@ -632,21 +632,20 @@
{#if toolsStore.hasEnabledCwdTools}
<ChatFormCurrentWorkingDirectory
- directory={cwd}
- isOpen={pickers.isWorkingDirectoryPickerOpen}
bind:query={pickers.workingDirectoryQuery}
customAnchor={mentionAnchor}
+ directory={cwd}
+ {disabled}
+ isOpen={pickers.isWorkingDirectoryPickerOpen}
onChange={handleWorkingDirectoryChange}
onClose={pickers.handleWorkingDirectoryClose}
onOpen={pickers.handleWorkingDirectoryOpen}
- {disabled}
/>
{/if}
</form>
<DialogMcpResourcesBrowser
bind:open={isResourceDialogOpen}
- preSelectedUri={preSelectedResourceUri}
onAttach={(resource: MCPResourceInfo) => {
mcpStore.attachResource(resource.uri);
}}
@@ -655,4 +654,5 @@
preSelectedResourceUri = undefined;
}
}}
+ preSelectedUri={preSelectedResourceUri}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddButton.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddButton.svelte
index ae76dedcad..60e7bd1d4a 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddButton.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddButton.svelte
@@ -18,8 +18,8 @@
class="file-upload-button md:h-8 md:w-8 h-9 w-9 rounded-full p-0"
{disabled}
{onclick}
- variant="secondary"
type="button"
+ variant="secondary"
>
<span class="sr-only">{ATTACHMENT_TOOLTIP_TEXT}</span>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte
index 92f5b93490..bceb43d2ab 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte
@@ -70,10 +70,10 @@
<DropdownMenu.SubContent class="w-72 pt-0">
{#if hasMcpServers}
<DropdownMenuSearchable
- placeholder="Search servers..."
bind:searchValue={mcpSearchQuery}
emptyMessage="No servers found"
isEmpty={filteredMcpServers.length === 0}
+ placeholder="Search servers..."
>
<div class="max-h-64 overflow-y-auto">
{#each filteredMcpServers as server (server.id)}
@@ -84,10 +84,10 @@
{@const faviconUrl = mcpStore.getServerFavicon(server.id)}
<button
- type="button"
class="flex w-full items-center justify-between gap-2 rounded-sm px-2 py-2 text-left transition-colors hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
- onclick={() => !hasError && toggleServerForChat(server.id)}
disabled={hasError}
+ onclick={() => !hasError && toggleServerForChat(server.id)}
+ type="button"
>
<div class="flex min-w-0 flex-1 items-center gap-2">
<div class="min-w-0 flex-1">
@@ -96,8 +96,8 @@
{faviconUrl}
iconClass={ICON_CLASS_DEFAULT}
iconRounded="rounded-sm"
- showVersion={false}
nameClass="text-sm"
+ showVersion={false}
/>
</div>
@@ -113,8 +113,8 @@
<Switch
checked={isEnabledForChat}
disabled={hasError}
- onclick={(e) => e.stopPropagation()}
onCheckedChange={() => toggleServerForChat(server.id)}
+ onclick={(e) => e.stopPropagation()}
/>
</button>
{/each}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte
index a3a0b3a20f..1b6fc4b020 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddReasoningSubmenu.svelte
@@ -64,6 +64,7 @@
<Tooltip.Trigger>
<Info class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
</Tooltip.Trigger>
+
<Tooltip.Content side="left">
<p>Maximum reasoning effort with extended context usage</p>
</Tooltip.Content>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
index 2e61bb07dd..2f69dc96de 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
@@ -78,7 +78,7 @@
<Sheet.Root bind:open={sheetOpen}>
{@render trigger({ disabled: chatFormActions.disabled, onclick: () => (sheetOpen = true) })}
- <Sheet.Content side="bottom" class="max-h-[85vh] gap-0 overflow-y-auto">
+ <Sheet.Content class="max-h-[85vh] gap-0 overflow-y-auto" side="bottom">
<Sheet.Header>
<Sheet.Title>Add to chat</Sheet.Title>
@@ -90,8 +90,8 @@
<div class="flex flex-col gap-1 px-1.5 pb-2">
{#if reasoning.modelSupportsThinking}
<Collapsible.Root
- open={reasoningExpanded}
onOpenChange={(open) => (reasoningExpanded = open)}
+ open={reasoningExpanded}
>
<Collapsible.Trigger class={sheetItemClass}>
{#if reasoningExpanded}
@@ -120,10 +120,10 @@
{#each reasoning.levels as level (level.value)}
{@const tokenLabel = reasoning.tokenLabel(level)}
<button
- type="button"
- class={sheetItemRowClass}
class:bg-accent={reasoning.isSelected(level)}
+ class={sheetItemRowClass}
onclick={() => reasoning.select(level)}
+ type="button"
>
<div class="flex min-w-0 items-center gap-3">
{#if reasoning.isSelected(level)}
@@ -147,7 +147,7 @@
</Collapsible.Root>
{/if}
- <Collapsible.Root open={filesExpanded} onOpenChange={(open) => (filesExpanded = open)}>
+ <Collapsible.Root onOpenChange={(open) => (filesExpanded = open)} open={filesExpanded}>
<Collapsible.Trigger class={sheetItemClass}>
{#if filesExpanded}
<ChevronDown class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -166,9 +166,9 @@
{@const enabled = attachmentMenu.isItemEnabled(item.enabledWhen)}
{#if enabled}
<button
- type="button"
class={sheetItemClass}
onclick={() => attachmentMenu.callbacks[item.action]()}
+ type="button"
>
<item.icon class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -177,7 +177,7 @@
{:else if item.disabledTooltip}
<Tooltip.Root delayDuration={TOOLTIP_DELAY_DURATION}>
<Tooltip.Trigger>
- <button type="button" class={sheetItemClass} disabled>
+ <button class={sheetItemClass} disabled type="button">
<item.icon class="{ICON_CLASS_DEFAULT} shrink-0" />
<span>{item.label}</span>
@@ -194,7 +194,7 @@
</Collapsible.Content>
</Collapsible.Root>
- <Collapsible.Root open={mcpExpanded} onOpenChange={(open) => (mcpExpanded = open)}>
+ <Collapsible.Root onOpenChange={(open) => (mcpExpanded = open)} open={mcpExpanded}>
<Collapsible.Trigger class={sheetItemClass}>
{#if mcpExpanded}
<ChevronDown class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -223,21 +223,21 @@
)}
<button
- type="button"
class={sheetItemRowClass}
+ disabled={hasError}
onclick={() =>
!hasError && conversationsStore.preferences.toggleMcpServerForChat(server.id)}
- disabled={hasError}
+ type="button"
>
<div class="flex min-w-0 flex-1 items-center gap-2">
{#if faviconUrl}
<img
- src={faviconUrl}
alt=""
class="{ICON_CLASS_DEFAULT} shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={faviconUrl}
/>
{/if}
@@ -270,7 +270,7 @@
</Collapsible.Root>
{#if toolsPanel.totalToolCount > 0}
- <Collapsible.Root open={toolsExpanded} onOpenChange={(open) => (toolsExpanded = open)}>
+ <Collapsible.Root onOpenChange={(open) => (toolsExpanded = open)} open={toolsExpanded}>
<Collapsible.Trigger class={sheetItemClass}>
{#if toolsExpanded}
<ChevronDown class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -295,18 +295,18 @@
{@const favicon = toolsPanel.getFavicon(group)}
<button
- type="button"
class={sheetItemRowClass}
onclick={() => toolsPanel.toggleGroupByKey(group.key)}
+ type="button"
>
{#if favicon}
<img
- src={favicon}
alt=""
class="{ICON_CLASS_DEFAULT} shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={favicon}
/>
{/if}
@@ -319,8 +319,8 @@
<Checkbox
{checked}
class="{ICON_CLASS_DEFAULT} shrink-0"
- onclick={(e) => e.stopPropagation()}
onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}
+ onclick={(e) => e.stopPropagation()}
/>
</button>
{/each}
@@ -330,9 +330,9 @@
{/if}
<button
- type="button"
class={sheetItemClass}
onclick={() => attachmentMenu.callbacks[AttachmentAction.SYSTEM_PROMPT_CLICK]()}
+ type="button"
>
<MessageSquare class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -341,9 +341,9 @@
{#if chatFormActions.hasMcpPromptsSupport}
<button
- type="button"
class={sheetItemClass}
onclick={() => attachmentMenu.callbacks[AttachmentAction.MCP_PROMPT_CLICK]()}
+ type="button"
>
<Zap class="{ICON_CLASS_DEFAULT} shrink-0" />
@@ -353,9 +353,9 @@
{#if chatFormActions.hasMcpResourcesSupport}
<button
- type="button"
class={sheetItemClass}
onclick={() => attachmentMenu.callbacks[AttachmentAction.MCP_RESOURCES_CLICK]()}
+ type="button"
>
<FolderOpen class="{ICON_CLASS_DEFAULT} shrink-0" />
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
index 58ae10673c..40fed27c70 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
@@ -68,8 +68,8 @@
{@const favicon = toolsPanel.getFavicon(group)}
<Collapsible.Root
- open={isExpanded}
onOpenChange={() => toolsPanel.toggleGroupExpanded(group.key)}
+ open={isExpanded}
>
<div class="flex items-center gap-1">
<Collapsible.Trigger
@@ -84,12 +84,12 @@
<span class="inline-flex min-w-0 items-center gap-1.5 font-medium">
{#if favicon}
<img
- src={favicon}
alt=""
class="{ICON_CLASS_DEFAULT} shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={favicon}
/>
{/if}
@@ -107,8 +107,8 @@
<Checkbox
{...props}
{checked}
- onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}
class="mr-2 {ICON_CLASS_DEFAULT} shrink-0"
+ onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}
/>
{/snippet}
</Tooltip.Trigger>
@@ -127,14 +127,14 @@
{#each group.tools as entry (entry.key)}
{@const enabled = toolsStore.isToolEnabled(entry.key)}
<button
- type="button"
class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm transition-colors hover:bg-muted/50"
onclick={() => toolsStore.toggleTool(entry.key)}
+ type="button"
>
<span
+ class="flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-input data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"
data-slot="checkbox"
data-state={enabled ? 'checked' : 'unchecked'}
- class="flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-input data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"
>
{#if enabled}
<Check class="size-3.5" />
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte
index f76333a1cb..a4baa40bf9 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte
@@ -153,17 +153,17 @@
{#if deviceStore.isMobile}
<ModelsSelectorSheet
- disabled={disabled || isOffline}
bind:this={selectorModelRef}
currentModel={selectorModel}
+ disabled={disabled || isOffline}
{forceForegroundText}
{useGlobalSelection}
/>
{:else}
<ModelsSelectorDropdown
- disabled={disabled || isOffline}
bind:this={selectorModelRef}
currentModel={selectorModel}
+ disabled={disabled || isOffline}
{forceForegroundText}
{useGlobalSelection}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionSubmit.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionSubmit.svelte
index eff0364fa0..5eaee0117b 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionSubmit.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionSubmit.svelte
@@ -17,16 +17,17 @@
{#snippet submitButton(props = {})}
<Button
- type="submit"
- disabled={isDisabled}
class={[
'md:h-8 md:w-8 h-9 w-9 rounded-full p-0',
showErrorState &&
'bg-red-400/10 text-red-400 hover:bg-red-400/20 hover:text-red-400 disabled:opacity-100'
]}
+ disabled={isDisabled}
+ type="submit"
{...props}
>
<span class="sr-only">Send</span>
+
<ArrowUp class="h-12 w-12" />
</Button>
{/snippet}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte
index 118e54a0a2..97351b3a6c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte
@@ -188,14 +188,14 @@
{#if showModelSelector}
<ChatFormActionModels
- {disabled}
- bind:this={selectorModelRef}
bind:hasAudioModality
+ bind:hasModelSelected
bind:hasVideoModality
bind:hasVisionModality
- bind:hasModelSelected
bind:isSelectedModelInCache
bind:submitTooltip
+ bind:this={selectorModelRef}
+ {disabled}
forceForegroundText
useGlobalSelection
/>
@@ -204,12 +204,12 @@
{#if isReasoning}
<Button
- type="button"
- variant="secondary"
+ class="group h-8 w-8 rounded-full p-0"
onclick={() =>
ChatService.stopReasoning(activeMessage?.completionId ?? '', activeMessage?.model)}
- class="group h-8 w-8 rounded-full p-0"
title="Skip reasoning"
+ type="button"
+ variant="secondary"
>
<span class="sr-only">Skip reasoning</span>
@@ -221,10 +221,10 @@
{#if isLoading && !canSubmit}
<Button
+ class="group h-8 w-8 rounded-full p-0 hover:bg-destructive/10!"
+ onclick={onStop}
type="button"
variant="secondary"
- onclick={onStop}
- class="group h-8 w-8 rounded-full p-0 hover:bg-destructive/10!"
>
<span class="sr-only">Stop</span>
@@ -238,8 +238,8 @@
<ChatFormActionSubmit
canSend={canSend && (showModelSelector ? hasModelSelected && isSelectedModelInCache : true)}
{disabled}
- tooltipLabel={submitTooltip}
showErrorState={showModelSelector && hasModelSelected && !isSelectedModelInCache}
+ tooltipLabel={submitTooltip}
/>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte
index d6bad98dc9..d3bf0446c1 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte
@@ -42,16 +42,16 @@
</script>
<div
- role="button"
- tabindex="0"
aria-label="Context usage"
- data-context-gauge-trigger
class="flex h-5 w-5 cursor-default items-center justify-center"
+ data-context-gauge-trigger
onclick={gaugeTriggerClick}
onkeydown={gaugeTriggerKeydown}
onpointerdown={gaugeTriggerPointerDown}
onpointerenter={gaugeTriggerEnter}
onpointerleave={gaugeTriggerLeave}
+ role="button"
+ tabindex="0"
>
- <ContextGaugeDial percent={gauge.contextPercent} level={gauge.colorLevel} />
+ <ContextGaugeDial level={gauge.colorLevel} percent={gauge.contextPercent} />
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetailRow.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetailRow.svelte
index 271997b393..572d4a42dd 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetailRow.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetailRow.svelte
@@ -11,6 +11,7 @@
<div class="grid gap-1.5">
<div class="flex items-baseline justify-between">
<span class="text-muted-foreground">{label}</span>
+
<span class="font-mono text-muted-foreground">{value}</span>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetails.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetails.svelte
index 1153c70fdd..0de508a619 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetails.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDetails.svelte
@@ -57,12 +57,13 @@
{#if cumulativeRead > 0}
<ContextGaugeDetailRow
label="Prompt tokens evaluated"
- value={`${cumulativeRead.toLocaleString()} tok`}
subtitle={cumulativeCacheTotal > 0
? `${cumulativeCacheTotal.toLocaleString()} reused from KV cache`
: undefined}
+ value={`${cumulativeRead.toLocaleString()} tok`}
/>
{/if}
+
{#if cumulativeOutput > 0}
<ContextGaugeDetailRow
label="Tokens generated"
@@ -83,10 +84,10 @@
{#if currentRead > 0}
<ContextGaugeDetailRow
label="Prompt"
- value={`${currentRead.toLocaleString()} tok`}
subtitle={currentCache > 0
? `${currentFresh.toLocaleString()} fresh + ${currentCache.toLocaleString()} cached`
: undefined}
+ value={`${currentRead.toLocaleString()} tok`}
/>
{/if}
@@ -100,6 +101,7 @@
<div class="pt-1 mt-0.5 border-t border-border/30">
<div class="flex justify-between">
<span class="text-muted-foreground">KV cache total</span>
+
<span class="font-mono font-medium">{kvTotal.toLocaleString()} tok</span>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDial.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDial.svelte
index 67d705ae45..32d08323d0 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDial.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeDial.svelte
@@ -18,7 +18,7 @@
const strokeWidth = $derived(size === 'md' ? 4 : 3);
</script>
-<svg viewBox="0 0 32 32" fill="none" class={dimensions}>
+<svg class={dimensions} fill="none" viewBox="0 0 32 32">
<circle
cx="16"
cy="16"
@@ -29,15 +29,15 @@
/>
<circle
+ class="transition-colors duration-300 {strokeLevelClass}"
cx="16"
cy="16"
r={RADIUS}
- class="transition-colors duration-300 {strokeLevelClass}"
stroke="currentColor"
- stroke-width={strokeWidth}
- stroke-linecap="round"
stroke-dasharray={CIRCUMFERENCE}
stroke-dashoffset={percent !== null ? CIRCUMFERENCE * (1 - percent / 100) : CIRCUMFERENCE}
+ stroke-linecap="round"
+ stroke-width={strokeWidth}
transform="rotate(-90 16 16)"
/>
</svg>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeLoadModel.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeLoadModel.svelte
index 022e626ae9..4edc72773f 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeLoadModel.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugeLoadModel.svelte
@@ -14,11 +14,13 @@
{#if modelId !== null && !isLoading}
<div class="flex flex-col gap-2 border-t border-border/50 pt-2 text-xs text-muted-foreground">
<span>Available context size is only visible once the model is loaded.</span>
- <Button size="sm" variant="secondary" class="self-start" onclick={onLoad}>Load model</Button>
+
+ <Button class="self-start" onclick={onLoad} size="sm" variant="secondary">Load model</Button>
</div>
{:else if isLoading}
<div class="flex items-center gap-2 border-t border-border/50 pt-2 text-xs text-muted-foreground">
<Loader2 class="h-3.5 w-3.5 animate-spin" />
+
<span>Loading model...</span>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugePopup.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugePopup.svelte
index 5d80ecc11b..8fa09cf704 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugePopup.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ContextGaugePopup.svelte
@@ -54,17 +54,19 @@
{#if gaugePopup.open}
<div
- role="status"
bind:this={cardEl}
class="absolute z-50 w-64 -translate-x-1/2 rounded-lg border border-border/50 bg-popover p-3 text-sm text-popover-foreground shadow-lg ring-1 ring-foreground/10"
- style="left: {gaugePopup.centerX}px; bottom: {gaugePopup.bottom}px"
onpointerenter={gaugeCardEnter}
onpointerleave={gaugeCardLeave}
+ role="status"
+ style="left: {gaugePopup.centerX}px; bottom: {gaugePopup.bottom}px"
>
<div class="flex flex-col gap-2">
<div class="flex items-center gap-2">
<span class="font-medium">Context</span>
+
<span class="text-muted-foreground">·</span>
+
<span class="font-mono text-muted-foreground">
{formatParameters(gauge.contextUsed)}
/ {gauge.contextTotal !== null ? formatParameters(gauge.contextTotal) : '-'}
@@ -73,8 +75,8 @@
{#if gauge.activeModelId !== null && !gauge.isActiveModelLoaded}
<ContextGaugeLoadModel
- modelId={gauge.activeModelId}
isLoading={gauge.isActiveModelLoading}
+ modelId={gauge.activeModelId}
onLoad={gauge.loadModel}
/>
{:else if showProgressBar}
@@ -91,6 +93,7 @@
<span>
<span class={colorLevelTextClass(gauge.colorLevel)}>{gauge.contextPercent}%</span> used
</span>
+
<span>
{formatParameters(gauge.contextAvailable ?? 0)} remaining
</span>
@@ -101,15 +104,15 @@
{#if gauge.hasAnyUsage}
<ContextGaugeDetails
- currentRead={gauge.currentRead}
- currentFresh={gauge.currentFresh}
+ averageTokensPerSecond={gauge.averageTokensPerSecond}
+ cumulativeCacheTotal={gauge.cumulativeCacheTotal}
+ cumulativeOutput={gauge.cumulativeOutput}
+ cumulativeRead={gauge.cumulativeRead}
currentCache={gauge.currentCache}
+ currentFresh={gauge.currentFresh}
currentOutput={gauge.currentOutput}
+ currentRead={gauge.currentRead}
kvTotal={gauge.kvTotal}
- cumulativeRead={gauge.cumulativeRead}
- cumulativeOutput={gauge.cumulativeOutput}
- cumulativeCacheTotal={gauge.cumulativeCacheTotal}
- averageTokensPerSecond={gauge.averageTokensPerSecond}
transientDetails={gauge.transientDetails}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectory.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectory.svelte
index 99b7763e35..307d0e702e 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectory.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectory.svelte
@@ -323,80 +323,81 @@
</script>
<button
- type="button"
class={[
'justify-self-start flex min-w-0 w-auto items-center gap-1 mt-1.5 py-1 px-2 backdrop-blur-2xl rounded-md',
className
]}
- onclick={onOpen}
{disabled}
+ onclick={onOpen}
+ type="button"
>
<ChatFormCurrentWorkingDirectoryChip
{directory}
- {homeBase}
{disabled}
- {showTooltip}
+ {homeBase}
onClear={handleDismiss}
+ {showTooltip}
/>
</button>
-<Popover.Root open={isOpen} onOpenChange={handleOpenChange}>
+<Popover.Root onOpenChange={handleOpenChange} open={isOpen}>
<Popover.Trigger
+ aria-hidden="true"
class="pointer-events-none absolute inset-0 opacity-0"
tabindex={-1}
- aria-hidden="true"
>
<span class="sr-only">Open working directory picker</span>
</Popover.Trigger>
<Popover.Content
- side="top"
align="start"
- sideOffset={12}
+ class="w-[var(--bits-popover-anchor-width)] max-w-none rounded-xl border-border/50 p-0 shadow-xl"
{customAnchor}
- preventScroll={false}
- onkeydown={handleKeydown}
- onOpenAutoFocus={(event) => event.preventDefault()}
onCloseAutoFocus={(event) => event.preventDefault()}
- class="w-[var(--bits-popover-anchor-width)] max-w-none rounded-xl border-border/50 p-0 shadow-xl"
+ onOpenAutoFocus={(event) => event.preventDefault()}
+ onkeydown={handleKeydown}
+ preventScroll={false}
+ side="top"
+ sideOffset={12}
>
<div class="p-2 min-h-22 flex flex-col justify-between">
<SearchInput
bind:ref={searchInputRef}
bind:value={query}
- placeholder="Choose working directory"
- onClose={closePicker}
class="w-full"
+ onClose={closePicker}
+ placeholder="Choose working directory"
/>
{#if !fileSearchEnabled}
<div class="px-2 py-1.5 text-sm text-muted-foreground">{searchUnavailableMessage}</div>
{:else if query.trim() && (search.isSearching || queryResults.length > 0 || searchError)}
<ChatFormCurrentWorkingDirectoryResultsList
- results={queryResults}
+ bind:container={listContainer}
+ error={searchError}
hoveredIndex={nav.hoveredIndex}
isSearching={search.isSearching}
- error={searchError}
- rawQuery={query}
- bind:container={listContainer}
onCommit={commit}
onHover={(index) => nav.setHover(index)}
+ rawQuery={query}
+ results={queryResults}
/>
{/if}
{#if pickerSupported && fileSearchEnabled}
<button
- type="button"
class="-mt-1 flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none hover:bg-accent hover:text-accent-foreground"
onclick={browseNative}
+ type="button"
>
<FolderOpen class="size-4 shrink-0 text-muted-foreground" />
+
<span>Browse</span>
</button>
{/if}
{#if homeBase && fileSearchEnabled}
- <div class="-mx-2 my-2 h-px bg-border/20" aria-hidden="true"></div>
+ <div aria-hidden="true" class="-mx-2 my-2 h-px bg-border/20"></div>
<span class="px-2 py-1.5 font-mono text-[10px]">
Searching in:
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryChip.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryChip.svelte
index 23661d223d..5a7b054cec 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryChip.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryChip.svelte
@@ -29,8 +29,8 @@
</script>
<span
- class="text-muted-foreground inline-flex items-center gap-1 text-xs group"
class:text-foreground={directory}
+ class="text-muted-foreground inline-flex items-center gap-1 text-xs group"
>
<div class="flex min-w-0 items-center gap-1 cursor-pointer">
<Folder class="w-3.5 h-3.5" />
@@ -42,6 +42,7 @@
<span {...props} class="max-w-64 truncate">{displayLabel}</span>
{/snippet}
</Tooltip.Trigger>
+
<Tooltip.Content>
<p>{displayLabelTitle}</p>
</Tooltip.Content>
@@ -56,14 +57,14 @@
class="w-0 overflow-hidden opacity-0 transition-[width,opacity] duration-200 ease-out group-hover:w-auto group-hover:opacity-100"
>
<ActionIcon
- icon={X}
- tooltip="Reset working directory"
ariaLabel="Reset working directory"
+ class="!h-4 !w-4 shrink-0 text-muted-foreground hover:text-foreground"
{disabled}
- onclick={onClear}
+ icon={X}
iconSize="h-3 w-3"
+ onclick={onClear}
stopPropagationOnClick
- class="!h-4 !w-4 shrink-0 text-muted-foreground hover:text-foreground"
+ tooltip="Reset working directory"
/>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryResultsList.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryResultsList.svelte
index e8087d967e..db86a4ba49 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryResultsList.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormCurrentWorkingDirectory/ChatFormCurrentWorkingDirectoryResultsList.svelte
@@ -34,8 +34,8 @@
<div
bind:this={container}
- class="max-h-48 overflow-y-auto py-2"
transition:fly={{ duration: FLY_DURATION_MS, y: FLY_Y_PX }}
+ class="max-h-48 overflow-y-auto py-2"
>
{#if isSearching && results.length === 0}
<div class="px-2 py-1.5 text-sm text-muted-foreground">Searching...</div>
@@ -48,14 +48,15 @@
<button
type="button"
{...{ [UI_DATA_ATTRS.RESULT_INDEX]: index }}
- data-highlighted={index === hoveredIndex ? '' : undefined}
class={cn(
'relative flex w-full cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-highlighted:bg-accent data-highlighted:text-accent-foreground'
)}
+ data-highlighted={index === hoveredIndex ? '' : undefined}
onclick={() => onCommit?.(path)}
onmouseenter={() => onHover?.(index)}
>
<Folder class="size-4 shrink-0 text-muted-foreground" />
+
<span class="min-w-0 flex-1 truncate font-mono text-left">
{#each highlightMatch(path, rawQuery.trim()) as seg, segIndex (segIndex)}
{#if seg.match}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInput.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInput.svelte
index b708ae0475..4a2cc386af 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInput.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInput.svelte
@@ -56,23 +56,23 @@
{#if useRichInput}
<ChatFormInputRich
bind:this={richRef}
+ bind:value
class={className}
{disabled}
{onInput}
{onKeydown}
{onPaste}
{placeholder}
- bind:value
/>
{:else}
<ChatFormInputBasic
bind:this={basicRef}
+ bind:value
class={className}
{disabled}
{onInput}
{onKeydown}
{onPaste}
{placeholder}
- bind:value
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputBasic.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputBasic.svelte
index af3585e747..0cd4516d87 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputBasic.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputBasic.svelte
@@ -69,14 +69,14 @@
'text-md min-h-12 w-full resize-none border-0 bg-transparent p-0 leading-6 outline-none placeholder:text-muted-foreground focus-visible:ring-0 focus-visible:ring-offset-0',
disabled && 'cursor-not-allowed'
]}
- style="max-height: var(--max-message-height);"
{disabled}
- onkeydown={onKeydown}
oninput={(event) => {
autoResizeTextarea(event.currentTarget);
onInput?.();
}}
+ onkeydown={onKeydown}
onpaste={onPaste}
{placeholder}
+ style="max-height: var(--max-message-height);"
></textarea>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputFileInputInvisible.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputFileInputInvisible.svelte
index 395ecb2011..dd90586905 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputFileInputInvisible.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputFileInputInvisible.svelte
@@ -24,8 +24,8 @@
<input
bind:this={fileInputElement}
- type="file"
+ class="hidden {className}"
{multiple}
onchange={handleFileSelect}
- class="hidden {className}"
+ type="file"
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputRich.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputRich.svelte
index 629001bb44..70251ea0cb 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputRich.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormInput/ChatFormInputRich.svelte
@@ -808,25 +808,25 @@
<div class="flex-1 {className} mb-0.5">
<div
bind:this={rootElement}
- contenteditable={!disabled}
- role="textbox"
- aria-multiline="true"
aria-disabled={disabled}
+ aria-multiline="true"
aria-placeholder={placeholder}
- data-placeholder={placeholder}
- tabindex={disabled ? -1 : 0}
class={[
'chat-form-input-rich text-md min-h-12 w-full overflow-y-auto whitespace-pre-wrap wrap-break-word border-0 bg-transparent p-0 leading-6 outline-none focus-visible:ring-0 focus-visible:ring-offset-0',
disabled && 'cursor-not-allowed'
]}
- style="max-height: var(--max-message-height);"
- oncompositionstart={handleCompositionStart}
+ contenteditable={!disabled}
+ data-placeholder={placeholder}
oncompositionend={handleCompositionEnd}
+ oncompositionstart={handleCompositionStart}
+ oncopy={handleCopy}
+ oncut={handleCut}
oninput={handleInput}
onkeydown={handleKeydown}
onpaste={handlePaste}
- oncopy={handleCopy}
- oncut={handleCut}
+ role="textbox"
+ style="max-height: var(--max-message-height);"
+ tabindex={disabled ? -1 : 0}
></div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte
index 18d86bcab6..6513114a43 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte
@@ -27,8 +27,8 @@
<ScrollCarousel gapSize="2" variant={ScrollCarouselVariant.CENTER}>
{#each attachments as attachment, i (attachment.id)}
<ChatAttachmentsListItemMcpResource
- class={i === 0 ? 'ml-3' : ''}
{attachment}
+ class={i === 0 ? 'ml-3' : ''}
onRemove={handleRemove}
onclick={() => handleResourceClick(attachment.resource.uri)}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerItemHeader.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerItemHeader.svelte
index d7c66f0d2d..67e2790df7 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerItemHeader.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerItemHeader.svelte
@@ -21,12 +21,12 @@
<div class="mb-0.5 flex items-center gap-1.5 text-xs text-muted-foreground">
{#if faviconUrl}
<img
- src={faviconUrl}
alt=""
class="h-3 w-3 shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={faviconUrl}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerList.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerList.svelte
index 160c14ce8e..2b3d6167a6 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerList.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerList.svelte
@@ -1,4 +1,4 @@
-<script lang="ts" generics="T">
+<script generics="T" lang="ts">
import { SearchInput } from '$lib/components/app';
import ScrollArea from '$lib/components/ui/scroll-area/scroll-area.svelte';
import { CHAT_FORM_POPOVER_MAX_HEIGHT, UI_DATA_ATTRS } from '$lib/constants';
@@ -67,11 +67,11 @@
{#if showSearchInput}
<div class="absolute top-0 right-0 left-0 z-10 p-2 pb-0">
<SearchInput
- {autofocus}
- placeholder={searchPlaceholder}
- bind:value={searchQuery}
bind:ref={inputRef}
+ bind:value={searchQuery}
+ {autofocus}
onClose={onSearchClose}
+ placeholder={searchPlaceholder}
/>
</div>
{/if}
@@ -85,8 +85,10 @@
{#each { length: skeletonCount } as _, rowIndex (rowIndex)}
<div class="flex items-start gap-3 rounded-lg px-3 py-2">
<div class="mt-0.5 size-4 shrink-0 animate-pulse rounded-md bg-muted/60"></div>
+
<div class="flex min-w-0 flex-1 flex-col">
<div class="h-5 w-2/5 animate-pulse rounded-sm bg-muted/60"></div>
+
<div class="h-4 w-1/3 animate-pulse rounded-sm bg-muted/40"></div>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItem.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItem.svelte
index 045534f488..f86216297c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItem.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItem.svelte
@@ -24,11 +24,11 @@
</script>
<button
- type="button"
- {...{ [UI_DATA_ATTRS.PICKER_INDEX]: dataIndex }}
{disabled}
{onclick}
{onmouseenter}
+ type="button"
+ {...{ [UI_DATA_ATTRS.PICKER_INDEX]: dataIndex }}
class="flex w-full cursor-pointer items-start gap-3 rounded-lg px-3 py-2 text-left hover:bg-accent/50 {isSelected
? 'bg-accent/50'
: ''} {disabled ? 'cursor-not-allowed opacity-50' : ''} {className}"
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItemSkeleton.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItemSkeleton.svelte
index cbf7b972e5..36910eda42 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItemSkeleton.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerListItemSkeleton.svelte
@@ -12,6 +12,7 @@
<!-- Server label skeleton -->
<div class="mb-2 flex items-center gap-1.5">
<div class="h-3 w-3 shrink-0 animate-pulse rounded-sm bg-muted"></div>
+
<div class="h-3 w-24 animate-pulse rounded bg-muted"></div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerPopover.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerPopover.svelte
index b09d346f13..2d91ceb540 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerPopover.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPicker/ChatFormPickerPopover.svelte
@@ -30,21 +30,21 @@
}}
>
<Popover.Trigger
+ aria-hidden="true"
class="pointer-events-none absolute inset-0 opacity-0"
tabindex={-1}
- aria-hidden="true"
>
<span class="sr-only">{srLabel}</span>
</Popover.Trigger>
<Popover.Content
- side="top"
align="start"
- sideOffset={12}
class="w-[var(--bits-popover-anchor-width)] max-w-none rounded-xl border-border/50 p-0 shadow-xl {className}"
- preventScroll={false}
- onkeydown={onKeydown}
onOpenAutoFocus={(event) => event.preventDefault()}
+ onkeydown={onKeydown}
+ preventScroll={false}
+ side="top"
+ sideOffset={12}
>
{@render children()}
</Popover.Content>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerCommand.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerCommand.svelte
index df654b25bb..dec9e5b1c7 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerCommand.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerCommand.svelte
@@ -104,34 +104,36 @@
<ChatFormPickerPopover
bind:isOpen
class={className}
- srLabel="Open command picker"
{onClose}
onKeydown={handleKeydown}
+ srLabel="Open command picker"
>
<ChatFormPickerList
- items={filteredCommands}
- isLoading={false}
- selectedIndex={nav.hoveredIndex}
- showSearchInput={false}
- searchQuery={query ?? ''}
emptyMessage="No matching command"
+ isLoading={false}
itemKey={(command) => command.name}
+ items={filteredCommands}
scrollTrigger={nav.scrollTrigger}
+ searchQuery={query ?? ''}
+ selectedIndex={nav.hoveredIndex}
+ showSearchInput={false}
>
{#snippet item(command, index, isSelected)}
{@const Icon = commandIcon[command.action]}
<ChatFormPickerListItem
dataIndex={index}
- {isSelected}
disabled={command.disabled}
+ {isSelected}
onclick={() => handleSelect(command)}
onmouseenter={() => {
if (!command.disabled) nav.setHover(index);
}}
>
<Icon class="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+
<div class="flex min-w-0 flex-1 flex-col">
<span class="font-mono text-sm font-medium">/{command.name}</span>
+
<span class="min-w-0 flex-1 truncate text-left text-xs text-muted-foreground">
{command.description}
</span>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte
index 9a5c3e7470..353d6e7baf 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte
@@ -359,9 +359,9 @@
<ChatFormPickerPopover
bind:isOpen
class={className}
- srLabel="Open prompt picker"
{onClose}
onKeydown={handleKeydown}
+ srLabel="Open prompt picker"
>
{#if selectedPrompt}
{@const prompt = selectedPrompt}
@@ -370,10 +370,10 @@
<div class="p-4">
<ChatFormPickerItemHeader
+ description={prompt.description}
{server}
{serverLabel}
title={prompt.title || prompt.name}
- description={prompt.description}
>
{#snippet titleExtra()}
{#if prompt.arguments?.length}
@@ -385,33 +385,33 @@
</ChatFormPickerItemHeader>
<ChatFormPromptPickerArgumentForm
- prompt={selectedPrompt}
- {promptArgs}
- {suggestions}
- {loadingSuggestions}
{activeAutocomplete}
{autocompleteIndex}
- {promptError}
- onArgInput={handleArgInput}
- onArgKeydown={handleArgKeydown}
+ {loadingSuggestions}
onArgBlur={handleArgBlur}
onArgFocus={handleArgFocus}
+ onArgInput={handleArgInput}
+ onArgKeydown={handleArgKeydown}
+ onCancel={handleCancelArgumentForm}
onSelectSuggestion={selectSuggestion}
onSubmit={handleArgumentSubmit}
- onCancel={handleCancelArgumentForm}
+ prompt={selectedPrompt}
+ {promptArgs}
+ {promptError}
+ {suggestions}
/>
</div>
{:else}
<ChatFormPickerList
- items={filteredPrompts}
- {isLoading}
- {selectedIndex}
bind:searchQuery={internalSearchQuery}
- {showSearchInput}
- searchPlaceholder="Search prompts..."
emptyMessage="No MCP prompts available"
+ {isLoading}
itemKey={(prompt) => prompt.serverName + ':' + prompt.name}
+ items={filteredPrompts}
{scrollTrigger}
+ searchPlaceholder="Search prompts..."
+ {selectedIndex}
+ {showSearchInput}
>
{#snippet item(prompt, index, isSelected)}
{@const server = serverSettingsMap.get(prompt.serverName)}
@@ -423,10 +423,10 @@
onclick={() => handlePromptClick(prompt)}
>
<ChatFormPickerItemHeader
+ description={prompt.description}
{server}
{serverLabel}
title={prompt.title || prompt.name}
- description={prompt.description}
>
{#snippet titleExtra()}
{#if prompt.arguments?.length}
@@ -440,7 +440,7 @@
{/snippet}
{#snippet skeleton()}
- <ChatFormPickerListItemSkeleton titleWidth="w-32" showBadge />
+ <ChatFormPickerListItemSkeleton showBadge titleWidth="w-32" />
{/snippet}
</ChatFormPickerList>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentForm.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentForm.svelte
index f665ce49c1..e0eed66006 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentForm.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentForm.svelte
@@ -38,20 +38,20 @@
}: Props = $props();
</script>
-<form onsubmit={onSubmit} class="space-y-3 pt-4">
+<form class="space-y-3 pt-4" onsubmit={onSubmit}>
{#each prompt.arguments ?? [] as arg (arg.name)}
<ChatFormPromptPickerArgumentInput
argument={arg}
- value={promptArgs[arg.name] ?? ''}
- suggestions={suggestions[arg.name] ?? []}
- isLoadingSuggestions={loadingSuggestions[arg.name] ?? false}
- isAutocompleteActive={activeAutocomplete === arg.name}
autocompleteIndex={activeAutocomplete === arg.name ? autocompleteIndex : 0}
- onInput={(value) => onArgInput(arg.name, value)}
- onKeydown={(e) => onArgKeydown(e, arg.name)}
+ isAutocompleteActive={activeAutocomplete === arg.name}
+ isLoadingSuggestions={loadingSuggestions[arg.name] ?? false}
onBlur={() => onArgBlur(arg.name)}
onFocus={() => onArgFocus(arg.name)}
+ onInput={(value) => onArgInput(arg.name, value)}
+ onKeydown={(e) => onArgKeydown(e, arg.name)}
onSelectSuggestion={(value) => onSelectSuggestion(arg.name, value)}
+ suggestions={suggestions[arg.name] ?? []}
+ value={promptArgs[arg.name] ?? ''}
/>
{/each}
@@ -67,7 +67,7 @@
{/if}
<div class="mt-8 flex justify-end gap-2">
- <Button type="button" size="sm" onclick={onCancel} variant="secondary">Cancel</Button>
+ <Button onclick={onCancel} size="sm" type="button" variant="secondary">Cancel</Button>
<Button size="sm" type="submit">Use Prompt</Button>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentInput.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentInput.svelte
index 074c69b841..b20c13cdf6 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentInput.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPromptPickerArgumentInput.svelte
@@ -36,7 +36,7 @@
</script>
<div class="relative grid gap-1">
- <Label for="arg-{argument.name}" class="mb-1 text-muted-foreground">
+ <Label class="mb-1 text-muted-foreground" for="arg-{argument.name}">
<span>
{argument.name}
@@ -51,30 +51,30 @@
</Label>
<Input
+ autocomplete="off"
id="arg-{argument.name}"
- type="text"
- {value}
- oninput={(e) => onInput(e.currentTarget.value)}
- onkeydown={onKeydown}
onblur={onBlur}
onfocus={onFocus}
+ oninput={(e) => onInput(e.currentTarget.value)}
+ onkeydown={onKeydown}
placeholder={argument.description || argument.name}
required={argument.required}
- autocomplete="off"
+ type="text"
+ {value}
/>
{#if isAutocompleteActive && suggestions.length > 0}
<div
- class="absolute top-full right-0 left-0 z-10 mt-1 max-h-32 overflow-y-auto rounded-lg border border-border/50 bg-background shadow-lg"
transition:fly={{ duration: 100, y: -5 }}
+ class="absolute top-full right-0 left-0 z-10 mt-1 max-h-32 overflow-y-auto rounded-lg border border-border/50 bg-background shadow-lg"
>
{#each suggestions as suggestion, i (suggestion)}
<button
- type="button"
- onmousedown={() => onSelectSuggestion(suggestion)}
class="w-full px-3 py-1.5 text-left text-sm hover:bg-accent {i === autocompleteIndex
? 'bg-accent'
: ''}"
+ onmousedown={() => onSelectSuggestion(suggestion)}
+ type="button"
>
{suggestion}
</button>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMention.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMention.svelte
index 2cc3bd8b6f..5a5c8320f9 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMention.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMention.svelte
@@ -187,10 +187,10 @@
</script>
<Popover.Root
- open={isOpen}
onOpenChange={(open) => {
if (!open) onClose();
}}
+ open={isOpen}
>
<!-- Invisible form-wide trigger: stops bits-ui's outside-click detector
from closing the picker when the user clicks inside the textarea.
@@ -198,36 +198,36 @@
(tabindex=-1 + pointer-events-none + opacity-0 + aria-hidden).
Positioning comes from `customAnchor` at the form's top edge. -->
<Popover.Trigger
+ aria-hidden="true"
class="pointer-events-none absolute inset-0 opacity-0"
tabindex={-1}
- aria-hidden="true"
>
<span class="sr-only">Open file mention picker</span>
</Popover.Trigger>
<Popover.Content
align="start"
- side="top"
- sideOffset={12}
- {customAnchor}
- preventScroll={false}
- onkeydown={handleKeydown}
- onOpenAutoFocus={(event) => event.preventDefault()}
- onCloseAutoFocus={(event) => event.preventDefault()}
class={[
'w-[var(--bits-popover-anchor-width)] max-w-none rounded-xl border-border/50 p-0 shadow-xl',
className
]}
+ {customAnchor}
+ onCloseAutoFocus={(event) => event.preventDefault()}
+ onOpenAutoFocus={(event) => event.preventDefault()}
+ onkeydown={handleKeydown}
+ preventScroll={false}
+ side="top"
+ sideOffset={12}
>
<ChatFormPickerList
- items={displayedItems}
- isLoading={search.isSearching}
- selectedIndex={nav.hoveredIndex}
- showSearchInput={false}
- searchQuery={query ?? ''}
{emptyMessage}
+ isLoading={search.isSearching}
itemKey={(entry) => entry.type + ':' + entry.path}
+ items={displayedItems}
scrollTrigger={nav.scrollTrigger}
+ searchQuery={query ?? ''}
+ selectedIndex={nav.hoveredIndex}
+ showSearchInput={false}
>
{#snippet item(entry, index, isSelected)}
<ChatFormPickerListItem
@@ -245,6 +245,7 @@
: 'text-muted-foreground'
]}
/>
+
<div class="flex min-w-0 flex-1 flex-col">
<div class="flex min-w-0 items-center gap-2">
{#if showTooltip}
@@ -254,6 +255,7 @@
<span {...props} class="truncate text-sm font-medium">{entry.name}</span>
{/snippet}
</Tooltip.Trigger>
+
<Tooltip.Content>
<p>{entry.path}</p>
</Tooltip.Content>
@@ -261,14 +263,16 @@
{:else}
<span class="truncate text-sm font-medium">{entry.name}</span>
{/if}
+
<span
class="shrink-0 rounded-full bg-muted px-1.5 py-0.5 font-mono text-[9px] uppercase tracking-wide text-muted-foreground"
>
{entry.type}
</span>
</div>
+
<span class="min-w-0 flex-1 truncate font-mono text-left text-xs">
- <HighlightedMatch text={abbreviateHome(entry.path, home)} query={trimmedQuery} />
+ <HighlightedMatch query={trimmedQuery} text={abbreviateHome(entry.path, home)} />
</span>
</div>
</ChatFormPickerListItem>
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickers.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickers.svelte
index dbe03e2e01..b9bc4cda57 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickers.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickers.svelte
@@ -79,30 +79,30 @@
<ChatFormPickerCommand
bind:this={commandPickerRef}
- isOpen={isCommandPickerOpen ?? false}
- query={commandQuery ?? ''}
{commands}
+ isOpen={isCommandPickerOpen ?? false}
onClose={onCommandPickerClose ?? (() => {})}
onSelect={onCommandSelect ?? (() => {})}
+ query={commandQuery ?? ''}
/>
<ChatFormPickerMcpPrompts
bind:this={promptPickerRef}
isOpen={isPromptPickerOpen}
- searchQuery={promptSearchQuery}
onClose={onPromptPickerClose}
- {onPromptLoadStart}
{onPromptLoadComplete}
{onPromptLoadError}
+ {onPromptLoadStart}
+ searchQuery={promptSearchQuery}
/>
<ChatFormPickerMention
bind:this={mentionPickerRef}
- isOpen={isMentionPickerOpen ?? false}
- query={mentionQuery ?? ''}
customAnchor={mentionAnchor}
- scopePath={scopePath ?? null}
+ isOpen={isMentionPickerOpen ?? false}
onClose={onMentionPickerClose ?? (() => {})}
onOpened={onMentionOpened}
onSelect={onMentionSelect ?? (() => {})}
+ query={mentionQuery ?? ''}
+ scopePath={scopePath ?? null}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessage.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessage.svelte
index b0f6b1b3d3..0c9ead61ec 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessage.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessage.svelte
@@ -381,13 +381,13 @@
}
</script>
-<div class="chat-message" class:chat-message--synthetic={isSynthetic}>
+<div class:chat-message--synthetic={isSynthetic} class="chat-message">
{#if message.role === MessageRole.SYSTEM}
<ChatMessageSystem bind:textareaElement class={className} {message} />
{:else if mcpPromptExtra}
- <ChatMessageMcpPrompt class={className} {message} mcpPrompt={mcpPromptExtra} />
+ <ChatMessageMcpPrompt class={className} mcpPrompt={mcpPromptExtra} {message} />
{:else if isSynthetic}
- <ChatMessageSynthetic {message} class={className} />
+ <ChatMessageSynthetic class={className} {message} />
{:else if message.role === MessageRole.USER}
<ChatMessageUser class={className} {isLastUserMessage} {message} {nextAssistantMessage} />
{:else}
@@ -396,9 +396,9 @@
class={className}
{isLastAssistantMessage}
{message}
- {toolMessages}
onContinue={handleContinue}
onRegenerate={handleRegenerate}
+ {toolMessages}
/>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte
index f0be6e95a3..a2c742f0fb 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte
@@ -126,16 +126,16 @@
<div
bind:this={assistantEl}
- class="chat-message-assistant text-md group w-full leading-7.5 {className}"
+ style:--assistant-margin-top={assistantMarginTop > 0 ? `${assistantMarginTop}px` : undefined}
style:--last-user-message-height={lastUserMessageHeight > 0
? `${lastUserMessageHeight}px`
: undefined}
- style:--assistant-margin-top={assistantMarginTop > 0 ? `${assistantMarginTop}px` : undefined}
- role="group"
aria-label="Assistant message with actions"
+ class="chat-message-assistant text-md group w-full leading-7.5 {className}"
+ role="group"
>
{#if showProcessingInfoTop}
- <ChatMessageAssistantProcessingInfo {modelLoadingText} {processingState} position="top" />
+ <ChatMessageAssistantProcessingInfo {modelLoadingText} position="top" {processingState} />
{/if}
{#if editCtx.isEditing}
@@ -145,16 +145,16 @@
<ChatMessageAssistantRawOutput {message} {toolMessages} />
{:else}
<ChatMessageAgenticContent
+ {isLastAssistantMessage}
+ isStreaming={chatStore.isStreaming()}
{message}
{toolMessages}
- isStreaming={chatStore.isStreaming()}
- {isLastAssistantMessage}
/>
{/if}
{/if}
{#if showProcessingInfoBottom}
- <ChatMessageAssistantProcessingInfo {modelLoadingText} {processingState} position="bottom" />
+ <ChatMessageAssistantProcessingInfo {modelLoadingText} position="bottom" {processingState} />
{/if}
{#if displayedModel}
@@ -168,8 +168,8 @@
/>
<ChatMessageAssistantStatistics
- {message}
isLoading={chatStore.isLoading}
+ {message}
{processingState}
showMessageStats={currentConfig.showMessageStats}
/>
@@ -179,14 +179,14 @@
{#if message.timestamp && !editCtx.isEditing}
<ChatMessageActionIcons
- role={MessageRole.ASSISTANT}
- justify="start"
actionsPosition="left"
- {onRegenerate}
+ justify="start"
onContinue={currentConfig.enableContinueGeneration ? onContinue : undefined}
- showRawOutputSwitch={currentConfig.showRawOutputSwitch}
- rawOutputEnabled={showRawOutput}
onRawOutputToggle={(enabled) => (showRawOutput = enabled)}
+ {onRegenerate}
+ rawOutputEnabled={showRawOutput}
+ role={MessageRole.ASSISTANT}
+ showRawOutputSwitch={currentConfig.showRawOutputSwitch}
/>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantProcessingInfo.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantProcessingInfo.svelte
index 52fbd4eaa3..f424b6737c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantProcessingInfo.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantProcessingInfo.svelte
@@ -13,7 +13,7 @@
const marginClass = $derived(position === 'top' ? 'mt-6' : 'mt-4');
</script>
-<div class="{marginClass} w-full max-w-3xl" in:fade>
+<div in:fade class="{marginClass} w-full max-w-3xl">
<div class="flex flex-col items-start gap-2">
<span class="shimmer-text text-sm">
{modelLoadingText ??
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantStatistics.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantStatistics.svelte
index e6e18ae080..0026c31c3b 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantStatistics.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantStatistics.svelte
@@ -24,22 +24,22 @@
{#if showMessageStats && isLiveFlowRoot && liveLlm}
<ChatMessageStatistics
- mode={ChatMessageStatisticsMode.GENERATION}
isLive
- promptTokens={liveLlm.prompt_n}
- promptMs={liveLlm.prompt_ms}
- predictedTokens={liveLlm.predicted_n}
+ mode={ChatMessageStatisticsMode.GENERATION}
predictedMs={liveLlm.predicted_ms}
+ predictedTokens={liveLlm.predicted_n}
+ promptMs={liveLlm.prompt_ms}
+ promptTokens={liveLlm.prompt_n}
/>
{:else if showMessageStats && message.timings && message.timings.predicted_n && message.timings.predicted_ms}
{@const agentic = message.timings.agentic}
<ChatMessageStatistics
+ agenticTimings={agentic}
mode={ChatMessageStatisticsMode.GENERATION}
- promptTokens={agentic ? agentic.llm.prompt_n : message.timings.prompt_n}
- promptMs={agentic ? agentic.llm.prompt_ms : message.timings.prompt_ms}
- predictedTokens={agentic ? agentic.llm.predicted_n : message.timings.predicted_n}
predictedMs={agentic ? agentic.llm.predicted_ms : message.timings.predicted_ms}
- agenticTimings={agentic}
+ predictedTokens={agentic ? agentic.llm.predicted_n : message.timings.predicted_n}
+ promptMs={agentic ? agentic.llm.prompt_ms : message.timings.prompt_ms}
+ promptTokens={agentic ? agentic.llm.prompt_n : message.timings.prompt_n}
/>
{:else if isLoading && showMessageStats}
{@const liveStats = processingState.getLiveProcessingStats()}
@@ -47,12 +47,12 @@
{#if genStats}
<ChatMessageStatistics
- mode={ChatMessageStatisticsMode.GENERATION}
isLive
- promptTokens={liveStats?.tokensProcessed}
- promptMs={liveStats?.timeMs}
- predictedTokens={genStats.tokensGenerated}
+ mode={ChatMessageStatisticsMode.GENERATION}
predictedMs={genStats.timeMs}
+ predictedTokens={genStats.tokensGenerated}
+ promptMs={liveStats?.timeMs}
+ promptTokens={liveStats?.tokensProcessed}
/>
{/if}
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageCwdChange.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageCwdChange.svelte
index 3869e19a0d..6d8d045dce 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageCwdChange.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageCwdChange.svelte
@@ -19,10 +19,13 @@
<div class="text-muted-foreground flex items-center gap-2 py-1.5 {className}">
{#if info.path === null}
<FolderX class="text-muted-foreground/60 h-3.5 w-3.5 shrink-0" />
+
<span class="text-foreground/80 text-sm font-medium">Working directory cleared</span>
{:else}
<Folder class="text-muted-foreground/60 h-3.5 w-3.5 shrink-0" />
+
<span class="text-foreground/80 text-sm font-medium">Set working directory to&nbsp;</span>
+
<span class="font-mono text-foreground/90 text-sm break-all" title={info.path}>
{info.display}
</span>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPrompt.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPrompt.svelte
index 4563b1fa86..1163c8a94d 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPrompt.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPrompt.svelte
@@ -29,9 +29,9 @@
<ChatMessageEditForm />
{:else}
<ChatMessageMcpPromptContent
+ class="w-full max-w-[80%]"
prompt={mcpPrompt}
variant={McpPromptVariant.MESSAGE}
- class="w-full max-w-[80%]"
/>
{#if message.timestamp}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPromptContent.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPromptContent.svelte
index 9190c7e62f..1ed1cca990 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPromptContent.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageMcpPrompt/ChatMessageMcpPromptContent.svelte
@@ -99,12 +99,12 @@
<Tooltip.Trigger>
{#if serverFavicon}
<img
- src={serverFavicon}
alt=""
class="h-3.5 w-3.5 shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={serverFavicon}
/>
{/if}
</Tooltip.Trigger>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSynthetic.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSynthetic.svelte
index aa4160c3f7..546a2c503a 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSynthetic.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSynthetic.svelte
@@ -17,7 +17,7 @@
</script>
{#if isCwdChange}
- <ChatMessageCwdChange {message} class={className} />
+ <ChatMessageCwdChange class={className} {message} />
{:else}
<span class="text-muted-foreground block text-sm {className}">{message.content}</span>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSystem/ChatMessageSystem.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSystem/ChatMessageSystem.svelte
index c6222f568c..7f4db944fd 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSystem/ChatMessageSystem.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageSystem/ChatMessageSystem.svelte
@@ -83,16 +83,16 @@
{#if editCtx.isEditing}
<div class="w-full max-w-[80%]">
<textarea
- style="max-height: var(--max-message-height);"
bind:this={textareaElement}
- value={editCtx.editedContent}
class="min-h-[60px] w-full resize-none rounded-2xl px-3 py-2 text-sm {INPUT_CLASSES}"
- onkeydown={handleEditKeydown}
oninput={(e) => {
autoResizeTextarea(e.currentTarget);
editCtx.setContent(e.currentTarget.value);
}}
+ onkeydown={handleEditKeydown}
placeholder="Edit system message..."
+ style="max-height: var(--max-message-height);"
+ value={editCtx.editedContent}
></textarea>
<div class="mt-2 flex justify-end gap-2">
@@ -104,8 +104,8 @@
<Button
class="h-8 px-3"
- onclick={editCtx.save}
disabled={!editCtx.editedContent.trim()}
+ onclick={editCtx.save}
size="sm"
>
<Check class="mr-1 h-3 w-3" />
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlock.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlock.svelte
index 3f75933154..a604a97e39 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlock.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlock.svelte
@@ -34,34 +34,34 @@
</script>
{#if isSearchCall}
- <ChatMessageToolCallBlockSearchResults {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockSearchResults {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.BROWSER_GET_DATETIME}
- <ChatMessageToolCallBlockGetDatetime {section} {isStreaming} />
+ <ChatMessageToolCallBlockGetDatetime {isStreaming} {section} />
{:else if section.toolName === BuiltInTool.SERVER_GET_INFO}
- <ChatMessageToolCallBlockGetInfo {section} {isStreaming} />
+ <ChatMessageToolCallBlockGetInfo {isStreaming} {section} />
{:else if section.toolName === BuiltInTool.SERVER_READ_FILE}
- <ChatMessageToolCallBlockReadFile {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockReadFile {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.BROWSER_READ_MEDIA}
- <ChatMessageToolCallBlockReadMedia {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockReadMedia {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.SERVER_EDIT_FILE}
- <ChatMessageToolCallBlockEditFile {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockEditFile {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.SERVER_WRITE_FILE}
- <ChatMessageToolCallBlockWriteFile {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockWriteFile {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.SERVER_EXEC_SHELL_COMMAND}
<ChatMessageToolCallBlockExecShellCommand
- {section}
- {open}
- {isStreaming}
- {isExecuting}
{attachments}
+ {isExecuting}
+ {isStreaming}
{onToggle}
+ {open}
+ {section}
/>
{:else if section.toolName === BuiltInTool.SERVER_FILE_GLOB_SEARCH}
- <ChatMessageToolCallBlockFileGlobSearch {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockFileGlobSearch {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.SERVER_GREP_SEARCH}
- <ChatMessageToolCallBlockGrepSearch {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockGrepSearch {isStreaming} {onToggle} {open} {section} />
{:else if section.toolName === BuiltInTool.BROWSER_RUN_JAVASCRIPT}
- <ChatMessageToolCallBlockRunJavascript {section} {open} {isStreaming} {onToggle} />
+ <ChatMessageToolCallBlockRunJavascript {isStreaming} {onToggle} {open} {section} />
{:else}
- <ChatMessageToolCallBlockDefault {section} {open} {isStreaming} {attachments} {onToggle} />
+ <ChatMessageToolCallBlockDefault {attachments} {isStreaming} {onToggle} {open} {section} />
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockDefault.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockDefault.svelte
index 3ca64a7823..4ca71b1396 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockDefault.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockDefault.svelte
@@ -34,15 +34,17 @@
);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={null} {title} {onToggle}>
+<ToolCallBlock {isStreaming} meta={null} {onToggle} {open} {section} {title}>
{#snippet children(_meta, ctx)}
{#if ctx.isStreamingCall}
<div class="mb-2 flex items-center gap-2 text-xs text-muted-foreground/70">
<span>Input</span>
+
{#if ctx.isStreaming}
<Loader2 class="h-3 w-3 animate-spin" />
{/if}
</div>
+
{#if section.toolArgs}
<SyntaxHighlightedCode
code={formatJsonPretty(section.toolArgs)}
@@ -67,6 +69,7 @@
<div class="mb-1.5 flex items-center gap-2 text-xs text-muted-foreground/70">
<span>Input</span>
</div>
+
<SyntaxHighlightedCode
code={formatJsonPretty(section.toolArgs ?? '')}
language={FileTypeText.JSON}
@@ -74,16 +77,19 @@
streaming={ctx.isCodeStreaming}
/>
{/if}
+
<div
class={showInput
? 'mt-4 mb-1.5 flex items-center gap-2 text-xs text-muted-foreground/70'
: 'mb-1.5 flex items-center gap-2 text-xs text-muted-foreground/70'}
>
<span>Output</span>
+
{#if ctx.isPending}
<Loader2 class="h-3 w-3 animate-spin" />
{/if}
</div>
+
{#if ctx.isPending}
<div class="rounded bg-muted/20 p-2 text-xs text-muted-foreground/70 italic">
Waiting for result...
@@ -96,18 +102,19 @@
maxHeight={MAX_HEIGHT_CODE_BLOCK}
/>
{:else if outputKind === ToolResultKind.MARKDOWN}
- <MarkdownContent content={section.toolResult} {attachments} />
+ <MarkdownContent {attachments} content={section.toolResult} />
{:else}
<div class="overflow-auto">
{#each parsedLines as line, i (i)}
<div class="font-mono text-[11px] leading-relaxed whitespace-pre-wrap">
{line.text}
</div>
+
{#if line.media}
{#if line.media.type === AttachmentType.AUDIO}
{@const audioMimeType = line.media.mimeType ?? MimeTypeAudio.MP3_MPEG}
<div class="mt-2 mb-2">
- <audio controls class="w-full rounded-lg">
+ <audio class="w-full rounded-lg" controls>
<source
src={createBase64DataUrl(audioMimeType, line.media.base64Data)}
type={audioMimeType}
@@ -117,10 +124,10 @@
</div>
{:else}
<img
- src={line.media.base64Url}
alt={line.media.name}
class="mt-2 mb-2 h-auto max-w-full rounded-lg"
loading="lazy"
+ src={line.media.base64Url}
/>
{/if}
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockEditFile.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockEditFile.svelte
index 6545cc39f7..2067e42688 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockEditFile.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockEditFile.svelte
@@ -23,12 +23,14 @@
);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={editFileMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={editFileMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
<span class="text-muted-foreground">Edit file </span>
+
<span class="font-mono" title={editFileMeta?.filePath}
>{abbreviateHome(editFileMeta?.filePath ?? '', home)}</span
>
+
{#if editFileMeta?.errorMessage}
<span class="ml-1 text-xs italic text-muted-foreground/70">(failed)</span>
{/if}
@@ -40,6 +42,7 @@
class="flex items-start gap-2 rounded bg-red-500/10 p-2 text-xs text-red-600 italic dark:text-red-400"
>
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{meta.errorMessage}</span>
</div>
{:else if meta && meta.edits.length > 0}
@@ -48,13 +51,17 @@
<div class="mb-1.5 text-xs text-muted-foreground/70 italic">
Edit {ei + 1}&nbsp;of&nbsp;{meta.edits.length}
</div>
- <div class="diff-block" style:max-height={MAX_HEIGHT_CODE_BLOCK}>
+
+ <div style:max-height={MAX_HEIGHT_CODE_BLOCK} class="diff-block">
<div class="diff-pre">
{#each diffLines as line, li (li)}
<div class="diff-line diff-{line.kind}">
<span class="diff-old-num">{line.oldLine ?? ''}</span>
+
<span class="diff-marker">{prefixFor(line.kind)}</span>
+
<span class="diff-new-num">{line.newLine ?? ''}</span>
+
<span class="diff-text">{line.text || ' '}</span>
</div>
{/each}
@@ -62,9 +69,11 @@
</div>
</div>
{/each}
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
{#if meta.resultMessage}
{meta.resultMessage}{meta.editsApplied != null ? RESULT_STAT_SEPARATOR : ''}{/if}
+
{#if meta.editsApplied != null}
<span class="font-mono">{meta.editsApplied}</span>
{meta.editsApplied === 1 ? 'edit' : 'edits'}&nbsp;applied
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockExecShellCommand.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockExecShellCommand.svelte
index d7103bf97f..075cde6796 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockExecShellCommand.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockExecShellCommand.svelte
@@ -176,6 +176,7 @@
{#snippet execShellTitle()}
{#if cwd}
<span class="exec-wd" title={cwd}>{wdDisplay}</span>
+
<span class="exec-prompt">$</span>
{/if}
@@ -187,14 +188,14 @@
{/snippet}
<ToolCallBlock
- {section}
- {open}
+ extraLiveStreaming={isLive}
{isStreaming}
meta={execShellMeta ? { errorMessage: execShellError } : null}
- wrapper={CollapsibleTerminalBlock}
- extraLiveStreaming={isLive}
- spinIconWhenActive={true}
{onToggle}
+ {open}
+ {section}
+ spinIconWhenActive={true}
+ wrapper={CollapsibleTerminalBlock}
>
{#snippet titleSnippet()}
{@render execShellTitle()}
@@ -209,23 +210,25 @@
{:else if execShellError}
<div class="flex items-start gap-2 text-xs text-red-600 italic dark:text-red-400">
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{execShellError}</span>
</div>
{:else if section.toolResult}
<div
bind:this={scrollEl}
- class="terminal-output"
class:is-clamped={!useFullHeightCodeBlocks}
+ class="terminal-output"
onscroll={handleScrollEvent}
>
{#each outputLines as line, i (i)}
<div class="font-mono text-[11px] leading-relaxed whitespace-pre-wrap">{line.text}</div>
+
{#if line.media?.type === AttachmentType.IMAGE}
<img
- src={line.media.base64Url}
alt={line.media.name}
class="mt-2 mb-2 h-auto max-w-full rounded-lg"
loading="lazy"
+ src={line.media.base64Url}
/>
{/if}
{/each}
@@ -234,14 +237,19 @@
<div class={exitBadgeClass}>
{#if execShellExitStatus.timedOut}
<AlertTriangle class="h-3 w-3" />
+
<span>timed out</span>
+
<span class="exit-sep">&middot;</span>
+
<span>exit {execShellExitStatus.code}</span>
{:else if execShellExitStatus.code === 0}
<Check class="h-3 w-3" />
+
<span>exit 0</span>
{:else}
<XCircle class="h-3 w-3" />
+
<span>exit {execShellExitStatus.code}</span>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockFileGlobSearch.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockFileGlobSearch.svelte
index 7a9fbe97b6..e1e9e1048f 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockFileGlobSearch.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockFileGlobSearch.svelte
@@ -19,16 +19,19 @@
const home = $derived(toolsStore.serverHome);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={fileGlobMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={fileGlobMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
{#if fileGlobMeta}
<span class="text-muted-foreground"
>{fileGlobMeta.include === '**' ? 'List files' : 'Search files'}&nbsp;</span
>
+
{#if fileGlobMeta.include !== '**'}
<span class="font-mono">{fileGlobMeta.include}</span>
{/if}
+
<span class="text-muted-foreground">&nbsp;in&nbsp;</span>
+
<span class="font-mono" title={fileGlobMeta.path}
>{abbreviateHome(fileGlobMeta.path, home)}</span
>
@@ -45,6 +48,7 @@
class="flex items-start gap-2 rounded bg-red-500/10 p-2 text-xs text-red-600 italic dark:text-red-400"
>
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{meta.errorMessage}</span>
</div>
{:else if meta && meta.matches.length > 0}
@@ -53,11 +57,13 @@
<div class="font-mono text-[11px] leading-relaxed whitespace-pre-wrap">{match}</div>
{/each}
</div>
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
Total matches: <span class="font-mono">{meta.totalMatches ?? meta.matches.length}</span>
</div>
{:else}
<div class="text-xs text-muted-foreground/70 italic">No matches</div>
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
Total matches: <span class="font-mono">{meta?.totalMatches ?? 0}</span>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetDatetime.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetDatetime.svelte
index 44b3ec6451..60ab14160f 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetDatetime.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetDatetime.svelte
@@ -44,15 +44,19 @@
<div class="text-muted-foreground flex items-center gap-2 py-1.5">
<Clock class="text-muted-foreground/60 h-3.5 w-3.5 shrink-0" />
+
{#if showSpinner}
<span class="text-foreground/80 text-sm font-medium">Current time</span>
+
<Loader2 class="text-muted-foreground/70 h-3 w-3 animate-spin" />
{:else if dateMeta.errorMessage}
<span class="text-foreground/80 text-sm font-medium">Current time&nbsp;</span>
+
<span class="text-red-600 text-xs italic dark:text-red-400">-&nbsp;{dateMeta.errorMessage}</span
>
{:else if dateMeta.dateString}
<span class="text-foreground/80 text-sm font-medium">Current time is&nbsp;</span>
+
<span class="font-mono text-foreground/90 text-sm">{dateMeta.dateString}</span>
{:else}
<span class="text-foreground/80 text-sm font-medium">Current time</span>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetInfo.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetInfo.svelte
index 6b39e7d92f..bd46b76dc9 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetInfo.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGetInfo.svelte
@@ -52,18 +52,23 @@
<div class="text-muted-foreground flex items-center gap-2 py-1.5">
<Info class="text-muted-foreground/60 h-3.5 w-3.5 shrink-0" />
+
{#if showSpinner}
<span class="text-foreground/80 text-sm font-medium">Runtime info</span>
+
<Loader2 class="text-muted-foreground/70 h-3 w-3 animate-spin" />
{:else if infoMeta.errorMessage}
<span class="text-foreground/80 text-sm font-medium">Runtime info&nbsp;</span>
+
<span class="text-red-600 text-xs italic dark:text-red-400">-&nbsp;{infoMeta.errorMessage}</span
>
{:else if infoMeta.os || infoMeta.cwd}
<span class="text-foreground/80 text-sm font-medium">Runtime info&nbsp;</span>
+
{#if infoMeta.os}
<span class="font-mono text-foreground/90 text-sm">{infoMeta.os}</span>
{/if}
+
{#if infoMeta.cwd}
<span class="font-mono text-foreground/90 text-sm" title={infoMeta.cwd}>{cwdDisplay}</span>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGrepSearch.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGrepSearch.svelte
index a56a8da9d6..9b57692472 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGrepSearch.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockGrepSearch.svelte
@@ -19,12 +19,15 @@
const home = $derived(toolsStore.serverHome);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={grepMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={grepMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
{#if grepMeta}
<span class="text-muted-foreground">Search for&nbsp;</span>
+
<span class="font-mono">{grepMeta.pattern}</span>
+
<span class="text-muted-foreground">&nbsp;in&nbsp;</span>
+
<span class="font-mono" title={grepMeta.path}>{abbreviateHome(grepMeta.path, home)}</span>
{/if}
{/snippet}
@@ -39,6 +42,7 @@
class="flex items-start gap-2 rounded bg-red-500/10 p-2 text-xs text-red-600 italic dark:text-red-400"
>
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{meta.errorMessage}</span>
</div>
{:else if meta && meta.matches.length > 0}
@@ -46,22 +50,28 @@
{#each meta.matches as match, mi (mi)}
<div class="font-mono text-[11px] leading-relaxed">
<span class="text-muted-foreground/70">{match.file}</span>
+
{#if meta.showLineNumbers && match.line != null}
<span class="text-muted-foreground/70">:{match.line}</span>
{/if}
+
<span class="text-muted-foreground/70">:</span>
+
<span>{match.content}</span>
</div>
{/each}
</div>
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
Total matches: <span class="font-mono">{meta.totalMatches ?? meta.matches.length}</span>
+
{#if meta.showLineNumbers}
&nbsp;<span class="italic">(with line numbers)</span>
{/if}
</div>
{:else}
<div class="text-xs text-muted-foreground/70 italic">No matches</div>
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
Total matches: <span class="font-mono">{meta?.totalMatches ?? 0}</span>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadFile.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadFile.svelte
index ad29e31d8f..13b4402228 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadFile.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadFile.svelte
@@ -17,10 +17,12 @@
const readFileMeta = $derived(parseReadFileMeta(section));
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={readFileMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={readFileMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
<span class="text-muted-foreground">Read file </span>
+
<span class="font-mono">{readFileMeta?.fileName}</span>
+
{#if readFileMeta?.lineRange}
<span class="text-muted-foreground"
>&nbsp;(lines {readFileMeta.lineRange.start}-{readFileMeta.lineRange.end})</span
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadMedia.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadMedia.svelte
index c6b2615c02..93d8990184 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadMedia.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockReadMedia.svelte
@@ -43,9 +43,10 @@
const audioMimeType = $derived(readMediaMeta?.mimeType ?? MimeTypeAudio.MP3_MPEG);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={readMediaMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={readMediaMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
<span class="text-muted-foreground">Read media </span>
+
<span class="font-mono">{readMediaMeta?.fileName}</span>
{/snippet}
@@ -57,7 +58,7 @@
</div>
{:else if mediaAttachment.type === AttachmentType.AUDIO}
<div class="mt-2">
- <audio controls class="w-full rounded-lg">
+ <audio class="w-full rounded-lg" controls>
<source
src={createBase64DataUrl(audioMimeType, mediaAttachment.base64Data)}
type={audioMimeType}
@@ -68,10 +69,10 @@
{:else}
<div class="mt-2">
<img
- src={mediaAttachment.base64Url}
alt={readMediaMeta?.fileName ?? 'media'}
class="max-h-[60vh] max-w-full rounded-lg object-contain shadow-lg"
loading="lazy"
+ src={mediaAttachment.base64Url}
/>
</div>
{/if}
@@ -81,6 +82,7 @@
{#if readMediaMeta?.sizeBytes}
<span>Size: {readMediaMeta.sizeBytes} bytes</span>
{/if}
+
{#if readMediaMeta?.mimeType}
<span>MIME: {readMediaMeta.mimeType}</span>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockRunJavascript.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockRunJavascript.svelte
index 5c60457dbe..1a96578166 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockRunJavascript.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockRunJavascript.svelte
@@ -21,7 +21,7 @@
const title = $derived(getToolUi(section.toolName)?.label ?? section.toolName ?? '');
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={runJsMeta} {title} {onToggle}>
+<ToolCallBlock {isStreaming} meta={runJsMeta} {onToggle} {open} {section} {title}>
{#snippet children(meta, ctx)}
{#if ctx.isPending}
<div class="rounded bg-muted/20 p-2 text-xs text-muted-foreground/70 italic">Running...</div>
@@ -30,8 +30,10 @@
class="flex items-start gap-2 rounded bg-red-500/10 p-2 text-xs text-red-600 italic dark:text-red-400"
>
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{meta.errorMessage}</span>
</div>
+
<div class="mt-3">
<SyntaxHighlightedCode
code={meta.code}
@@ -47,13 +49,17 @@
maxHeight={MAX_HEIGHT_CODE_BLOCK}
streaming={ctx.isCodeStreaming}
/>
+
<div class="mb-2 mt-3 flex items-center gap-2 text-xs text-muted-foreground/70">
<Terminal class="h-3 w-3" />
+
<span>Console</span>
+
{#if meta.timeoutMs != null}
<span class="font-mono">&middot;&nbsp;timeout&nbsp;{meta.timeoutMs}&nbsp;ms</span>
{/if}
</div>
+
{#if section.toolResult}
<div class="mt-1">
<SyntaxHighlightedCode
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockSearchResults.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockSearchResults.svelte
index e6bd947220..b5d712337b 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockSearchResults.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockSearchResults.svelte
@@ -86,55 +86,60 @@
{@const safeUrl = sanitizeExternalUrl(result.url)}
{@const showHoverCard = safeUrl !== null && hasDetails(result)}
{#if safeUrl}
- <HoverCard.Root openDelay={150} closeDelay={100}>
+ <HoverCard.Root closeDelay={100} openDelay={150}>
<HoverCard.Trigger
+ class="hover:bg-muted/80 focus-visible:ring-ring inline-flex max-w-full items-center gap-1.5 rounded-full border bg-muted px-2.5 py-1 text-xs transition-colors outline-none focus-visible:ring-2"
href={safeUrl}
- target="_blank"
rel="noopener noreferrer"
- class="hover:bg-muted/80 focus-visible:ring-ring inline-flex max-w-full items-center gap-1.5 rounded-full border bg-muted px-2.5 py-1 text-xs transition-colors outline-none focus-visible:ring-2"
+ target="_blank"
>
{#if faviconUrl}
<img
- src={faviconUrl}
alt=""
class="h-3 w-3 shrink-0 rounded-sm"
onerror={hideBrokenIcon}
+ src={faviconUrl}
/>
{:else}
<Globe class="text-muted-foreground/70 h-3 w-3 shrink-0" />
{/if}
+
<span class="truncate font-medium text-foreground/80">{result.title}</span>
</HoverCard.Trigger>
+
{#if showHoverCard}
{@const publishDate = formatPublishDate(result.published)}
{@const host = hostFor(safeUrl)}
<HoverCard.Content
- side="top"
align="start"
- sideOffset={6}
class="bg-popover text-popover-foreground z-50 w-80 max-w-[90vw] rounded-lg border p-0 shadow-lg"
+ side="top"
+ sideOffset={6}
>
<div class="flex flex-col gap-2 p-3">
<a
+ class="line-clamp-3 text-sm font-medium leading-snug hover:underline"
href={safeUrl}
- target="_blank"
rel="noopener noreferrer"
- class="line-clamp-3 text-sm font-medium leading-snug hover:underline"
- >{result.title}</a
+ target="_blank">{result.title}</a
>
+
{#if publishDate || result.author}
<div class="text-muted-foreground flex items-center gap-1.5 text-[11px]">
{#if publishDate}
<span>{publishDate}</span>
{/if}
+
{#if publishDate && result.author}
<span class="opacity-50">&middot;</span>
{/if}
+
{#if result.author}
<span class="truncate">{result.author}</span>
{/if}
</div>
{/if}
+
{#if result.highlights}
<p
class="text-popover-foreground/85 line-clamp-5 text-xs leading-relaxed whitespace-pre-line"
@@ -142,6 +147,7 @@
{result.highlights}
</p>
{/if}
+
{#if host}
<div class="text-muted-foreground/80 truncate text-[11px]">{host}</div>
{/if}
@@ -152,7 +158,7 @@
{/if}
{/snippet}
-<CollapsibleContentBlock {open} class="my-2" {icon} {iconClass} {iconUrl} {title} {onToggle}>
+<CollapsibleContentBlock class="my-2" {icon} {iconClass} {iconUrl} {onToggle} {open} {title}>
{#if results.length > 0}
<div class="flex flex-wrap items-center gap-2 pb-1">
{#each results as result (result.url)}
@@ -162,6 +168,7 @@
{:else if showSpinner}
<div class="text-muted-foreground/70 flex items-center gap-2 py-1 text-xs italic">
<Loader2 class="h-3 w-3 animate-spin" />
+
<span>Searching...</span>
</div>
{:else}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockWriteFile.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockWriteFile.svelte
index 2551fb0b21..178c479d98 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockWriteFile.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ChatMessageToolCallBlockWriteFile.svelte
@@ -21,12 +21,14 @@
const home = $derived(toolsStore.serverHome);
</script>
-<ToolCallBlock {section} {open} {isStreaming} meta={writeFileMeta} {onToggle}>
+<ToolCallBlock {isStreaming} meta={writeFileMeta} {onToggle} {open} {section}>
{#snippet titleSnippet()}
<span class="text-muted-foreground">Write file </span>
+
<span class="font-mono" title={writeFileMeta?.filePath}
>{abbreviateHome(writeFileMeta?.filePath ?? '', home)}</span
>
+
{#if writeFileMeta?.errorMessage}
<span class="ml-1 text-xs italic text-muted-foreground/70">(failed)</span>
{/if}
@@ -38,6 +40,7 @@
class="flex items-start gap-2 rounded bg-red-500/10 p-2 text-xs text-red-600 italic dark:text-red-400"
>
<XCircle class="mt-0.5 h-3 w-3 shrink-0" />
+
<span>{meta.errorMessage}</span>
</div>
{:else if meta}
@@ -47,9 +50,11 @@
maxHeight={MAX_HEIGHT_CODE_BLOCK}
streaming={ctx.isCodeStreaming}
/>
+
<div class="mt-1.5 text-xs text-muted-foreground/70 italic">
{#if meta.resultMessage}
{meta.resultMessage}{meta.bytesWritten != null ? RESULT_STAT_SEPARATOR : ''}{/if}
+
{#if meta.bytesWritten != null}
<span class="font-mono">{meta.bytesWritten}</span>
bytes
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ToolCallBlock.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ToolCallBlock.svelte
index 08da39a2ac..16dd6e1088 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ToolCallBlock.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageToolCall/ToolCallBlock.svelte
@@ -1,4 +1,4 @@
-<script lang="ts" generics="TMeta">
+<script generics="TMeta" lang="ts">
// Generic chrome shell shared by every per-tool block under
// `ChatMessageToolCall/`. Owns:
// - the collapsible wrapper (defaults to CollapsibleContentBlock;
@@ -114,15 +114,15 @@
</script>
<Wrapper
- {open}
class="my-2"
icon={toolIcon}
iconClass={toolIconClass}
{iconUrl}
+ {onToggle}
+ {open}
+ {subtitle}
{title}
{titleSnippet}
- {subtitle}
- {onToggle}
>
{@render children(meta, {
isCodeStreaming,
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUser.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUser.svelte
index d217a9c382..8be39f892c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUser.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUser.svelte
@@ -69,8 +69,8 @@
<ChatMessageEditForm />
{:else}
<ChatMessageUserBubble
- content={message.content}
attachments={message.extra}
+ content={message.content}
renderMarkdown={true}
/>
@@ -82,8 +82,8 @@
>
<ChatMessageStatistics
mode={ChatMessageStatisticsMode.READING}
- promptTokens={storedReadingStats!.promptTokens}
promptMs={storedReadingStats!.promptMs}
+ promptTokens={storedReadingStats!.promptTokens}
/>
</div>
</div>
@@ -95,10 +95,10 @@
class="inline-flex flex-wrap items-start justify-end gap-2 text-xs text-muted-foreground"
>
<ChatMessageStatistics
- mode={ChatMessageStatisticsMode.READING}
isLive
- promptTokens={liveStats.tokensProcessed}
+ mode={ChatMessageStatisticsMode.READING}
promptMs={liveStats.timeMs}
+ promptTokens={liveStats.tokensProcessed}
/>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserBubble.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserBubble.svelte
index 99539c3051..65818c64bd 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserBubble.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserBubble.svelte
@@ -54,7 +54,7 @@
{#if attachments && attachments.length > 0}
<div class="mb-2 max-w-[80%]">
- <ChatAttachmentsList {attachments} readonly imageHeight="h-40" />
+ <ChatAttachmentsList {attachments} imageHeight="h-40" readonly />
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserPending.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserPending.svelte
index a072f2e84d..40b299a83e 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserPending.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageUser/ChatMessageUserPending.svelte
@@ -37,11 +37,11 @@
<ChatMessageEditForm />
{:else}
<ChatMessageUserBubble
- {content}
attachments={extras}
- textColorClass="text-muted-foreground"
cardBgClass="dark:bg-primary/8"
+ {content}
maxHeightStyle="overflow-wrap: anywhere; word-break: break-word;"
+ textColorClass="text-muted-foreground"
/>
<div class="max-w-[80%]">
@@ -50,9 +50,11 @@
<div
class="pointer-events-auto inset-0 flex items-center gap-1 opacity-0 transition-all duration-150 group-hover:opacity-100"
>
- <ActionIcon icon={Edit} tooltip="Edit" onclick={editCtx.handleEdit} />
- <ActionIcon icon={Trash2} tooltip="Delete" onclick={onDelete} />
- <ActionIcon icon={ArrowUp} tooltip="Send immediately" onclick={onSendImmediately} />
+ <ActionIcon icon={Edit} onclick={editCtx.handleEdit} tooltip="Edit" />
+
+ <ActionIcon icon={Trash2} onclick={onDelete} tooltip="Delete" />
+
+ <ActionIcon icon={ArrowUp} onclick={onSendImmediately} tooltip="Send immediately" />
</div>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCard.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCard.svelte
index 0ee66829ab..e7e1682336 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCard.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCard.svelte
@@ -14,10 +14,12 @@
<div class="my-2 rounded-lg border border-border bg-card p-3">
<div class="mb-3 flex items-center gap-2 text-sm">
<IconComponent class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground" />
+
<span>
{@render message()}
</span>
</div>
+
<div class="flex flex-wrap items-center gap-2">
{@render actions()}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardContinueRequest.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardContinueRequest.svelte
index cb8ad09cd3..f79d2604b1 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardContinueRequest.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardContinueRequest.svelte
@@ -16,13 +16,13 @@
{/snippet}
{#snippet actions()}
- <Button size="sm" onclick={() => onDecision(true)}>Continue</Button>
+ <Button onclick={() => onDecision(true)} size="sm">Continue</Button>
<Button
- variant="destructive"
- size="sm"
class="text-destructive hover:text-destructive"
onclick={() => onDecision(false)}
+ size="sm"
+ variant="destructive"
>
Stop
</Button>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardPermissionRequest.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardPermissionRequest.svelte
index e8af944640..d6d56dde4c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardPermissionRequest.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionCard/ChatMessageActionCardPermissionRequest.svelte
@@ -28,10 +28,10 @@
<DropdownMenu.Root>
<ButtonGroup.Root class="overflow-hidden rounded-md shadow-sm">
<Button
- variant="secondary"
- size="sm"
class="!rounded-r-none !shadow-none"
onclick={() => onDecision(ToolPermissionDecision.ONCE)}
+ size="sm"
+ variant="secondary"
>
Allow once
</Button>
@@ -39,11 +39,11 @@
<ButtonGroup.Separator />
<DropdownMenu.Trigger
+ aria-label="More allow options"
class={cn(
buttonVariants({ size: 'sm', variant: 'secondary' }),
'inline-flex cursor-pointer items-center !rounded-l-none !shadow-none !px-2'
)}
- aria-label="More allow options"
>
<ChevronDown class="h-3.5 w-3.5" />
</DropdownMenu.Trigger>
@@ -54,6 +54,7 @@
Always allow <pre>{toolName}</pre>
tool
</DropdownMenu.Item>
+
{#if serverLabel}
<DropdownMenu.Item onclick={() => onDecision(ToolPermissionDecision.ALWAYS_SERVER)}>
Always allow all tools from {serverLabel}
@@ -73,7 +74,7 @@
</DropdownMenu.Content>
</DropdownMenu.Root>
- <Button variant="destructive" size="sm" onclick={() => onDecision(ToolPermissionDecision.DENY)}>
+ <Button onclick={() => onDecision(ToolPermissionDecision.DENY)} size="sm" variant="destructive">
Deny
</Button>
{/snippet}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIcons.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIcons.svelte
index 895f391255..68ec5c8468 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIcons.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIcons.svelte
@@ -77,29 +77,30 @@
<div
class="pointer-events-auto inset-0 flex items-center gap-1 opacity-100 transition-all duration-150"
>
- <ActionIcon icon={Copy} tooltip="Copy" onclick={messageActions.copy} />
+ <ActionIcon icon={Copy} onclick={messageActions.copy} tooltip="Copy" />
- <ActionIcon icon={Edit} tooltip="Edit" onclick={editCtx.startEdit} />
+ <ActionIcon icon={Edit} onclick={editCtx.startEdit} tooltip="Edit" />
{#if role === MessageRole.ASSISTANT && onRegenerate}
- <ActionIcon icon={RefreshCw} tooltip="Regenerate" onclick={() => onRegenerate()} />
+ <ActionIcon icon={RefreshCw} onclick={() => onRegenerate()} tooltip="Regenerate" />
{/if}
{#if role === MessageRole.ASSISTANT && onContinue}
- <ActionIcon icon={ArrowRight} tooltip="Continue" onclick={onContinue} />
+ <ActionIcon icon={ArrowRight} onclick={onContinue} tooltip="Continue" />
{/if}
{#if messageActions.forkConversation}
- <ActionIcon icon={GitBranch} tooltip="Fork conversation" onclick={handleOpenForkDialog} />
+ <ActionIcon icon={GitBranch} onclick={handleOpenForkDialog} tooltip="Fork conversation" />
{/if}
- <ActionIcon icon={Trash2} tooltip="Delete" onclick={messageActions.requestDelete} />
+ <ActionIcon icon={Trash2} onclick={messageActions.requestDelete} tooltip="Delete" />
</div>
</div>
{#if showRawOutputSwitch}
<div class="flex items-center gap-2">
<span class="text-xs text-muted-foreground">Show raw output</span>
+
<Switch
checked={rawOutputEnabled}
onCheckedChange={(checked) => onRawOutputToggle?.(checked)}
@@ -109,54 +110,54 @@
</div>
<DialogConfirmation
- open={messageActions.showDeleteDialog}
- title="Delete Message"
- description={messageActions.deletionInfo && messageActions.deletionInfo.totalCount > 1
- ? `This will delete ${messageActions.deletionInfo.totalCount} messages including: ${messageActions.deletionInfo.userMessages} user message${messageActions.deletionInfo.userMessages > 1 ? 's' : ''} and ${messageActions.deletionInfo.assistantMessages} assistant response${messageActions.deletionInfo.assistantMessages > 1 ? 's' : ''}. All messages in this branch and their responses will be permanently removed. This action cannot be undone.`
- : 'Are you sure you want to delete this message? This action cannot be undone.'}
+ cancelText="Cancel"
confirmText={messageActions.deletionInfo && messageActions.deletionInfo.totalCount > 1
? `Delete ${messageActions.deletionInfo.totalCount} Messages`
: 'Delete'}
- cancelText="Cancel"
- variant="destructive"
+ description={messageActions.deletionInfo && messageActions.deletionInfo.totalCount > 1
+ ? `This will delete ${messageActions.deletionInfo.totalCount} messages including: ${messageActions.deletionInfo.userMessages} user message${messageActions.deletionInfo.userMessages > 1 ? 's' : ''} and ${messageActions.deletionInfo.assistantMessages} assistant response${messageActions.deletionInfo.assistantMessages > 1 ? 's' : ''}. All messages in this branch and their responses will be permanently removed. This action cannot be undone.`
+ : 'Are you sure you want to delete this message? This action cannot be undone.'}
icon={Trash2}
- onConfirm={handleConfirmDelete}
onCancel={() => messageActions.setShowDeleteDialog(false)}
+ onConfirm={handleConfirmDelete}
+ open={messageActions.showDeleteDialog}
+ title="Delete Message"
+ variant="destructive"
/>
<DialogConfirmation
bind:open={showForkDialog}
- title="Fork Conversation"
- description="Create a new conversation branching from this message."
- confirmText="Fork"
cancelText="Cancel"
+ confirmText="Fork"
+ description="Create a new conversation branching from this message."
icon={GitBranch}
- onConfirm={handleConfirmFork}
onCancel={() => (showForkDialog = false)}
+ onConfirm={handleConfirmFork}
+ title="Fork Conversation"
>
<div class="flex flex-col gap-4 py-2">
<div class="flex flex-col gap-2">
<Label for="fork-name">Title</Label>
<Input
- id="fork-name"
+ bind:value={forkName}
class="text-foreground"
+ id="fork-name"
placeholder="Enter fork name"
type="text"
- bind:value={forkName}
/>
</div>
<div class="flex items-center gap-2">
<Checkbox
- id="fork-attachments"
checked={forkIncludeAttachments}
+ id="fork-attachments"
onCheckedChange={(checked) => {
forkIncludeAttachments = checked === true;
}}
/>
- <Label for="fork-attachments" class="cursor-pointer text-sm font-normal">
+ <Label class="cursor-pointer text-sm font-normal" for="fork-attachments">
Include all attachments
</Label>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIconsBranchingControls.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIconsBranchingControls.svelte
index b7f99f0f3d..fbd79b7b46 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIconsBranchingControls.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageActions/ChatMessageActionIcons/ChatMessageActionIconsBranchingControls.svelte
@@ -30,11 +30,11 @@
role="navigation"
>
<ActionIcon
- icon={ChevronLeft}
- tooltip="Previous version"
- disabled={!hasPrevious}
class="h-5 w-5 p-0 {!hasPrevious ? '!cursor-not-allowed opacity-30' : ''}"
+ disabled={!hasPrevious}
+ icon={ChevronLeft}
onclick={() => messageActions.navigateToSibling(previousSiblingId!)}
+ tooltip="Previous version"
/>
<span class="px-1 font-mono text-xs">
@@ -42,11 +42,11 @@
</span>
<ActionIcon
- icon={ChevronRight}
- tooltip="Next version"
- disabled={!hasNext}
class="h-5 w-5 p-0 {!hasNext ? 'opacity-30' : ''}"
+ disabled={!hasNext}
+ icon={ChevronRight}
onclick={() => messageActions.navigateToSibling(nextSiblingId!)}
+ tooltip="Next version"
/>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte
index 7a21c67666..011d1fbebf 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte
@@ -181,26 +181,26 @@
{#snippet renderSection(section: AgenticSection, index: number)}
{#if section.type === AgenticSectionType.TEXT}
<div class="agentic-text">
- <MarkdownContent content={section.content} attachments={message?.extra} />
+ <MarkdownContent attachments={message?.extra} content={section.content} />
</div>
{:else if section.type === AgenticSectionType.REASONING || section.type === AgenticSectionType.REASONING_PENDING}
<ChatMessageReasoningBlock
- {section}
- open={isExpanded(index, section)}
- {isStreaming}
- {hasReasoningError}
attachments={message?.extra}
+ {hasReasoningError}
+ {isStreaming}
onToggle={() => toggleExpanded(index, section)}
+ open={isExpanded(index, section)}
+ {section}
/>
{:else if section.type === AgenticSectionType.TOOL_CALL || section.type === AgenticSectionType.TOOL_CALL_PENDING || section.type === AgenticSectionType.TOOL_CALL_STREAMING}
<ChatMessageToolCallBlock
- {section}
- open={isExpanded(index, section)}
- {isStreaming}
+ attachments={message?.extra}
isExecuting={section.toolCallId !== undefined &&
section.toolCallId === currentlyExecutingToolCallId}
- attachments={message?.extra}
+ {isStreaming}
onToggle={() => toggleExpanded(index, section)}
+ open={isExpanded(index, section)}
+ {section}
/>
{/if}
{/snippet}
@@ -218,15 +218,15 @@
{#if turnStats && showAgenticTurnStats}
<div class="turn-stats transition-opacity duration-150 mt-1 mb-4">
<ChatMessageStatistics
- promptTokens={turnStats.llm.prompt_n}
- promptMs={turnStats.llm.prompt_ms}
- predictedTokens={turnStats.llm.predicted_n}
- predictedMs={turnStats.llm.predicted_ms}
agenticTimings={turnStats.toolCalls.length > 0
? buildTurnAgenticTimings(turnStats)
: undefined}
- initialView={ChatMessageStatsView.GENERATION}
hideSummary
+ initialView={ChatMessageStatsView.GENERATION}
+ predictedMs={turnStats.llm.predicted_ms}
+ predictedTokens={turnStats.llm.predicted_n}
+ promptMs={turnStats.llm.prompt_ms}
+ promptTokens={turnStats.llm.prompt_n}
/>
</div>
{/if}
@@ -240,9 +240,9 @@
{#if pendingPermission && !permissionDismissed}
<ChatMessageActionCardPermissionRequest
- toolName={pendingPermission.toolName}
- serverLabel={pendingPermission.serverLabel}
onDecision={handlePermission}
+ serverLabel={pendingPermission.serverLabel}
+ toolName={pendingPermission.toolName}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageEditForm.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageEditForm.svelte
index 369b6137b4..41d79387b6 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageEditForm.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageEditForm.svelte
@@ -102,35 +102,35 @@
<div class="relative w-full max-w-[80%]">
<ChatForm
- value={editCtx.editedContent}
- attachments={editCtx.editedExtras}
bind:uploadedFiles={editCtx.editedUploadedFiles}
- placeholder="Edit your message..."
- showMcpPromptButton
- showAddButton={editCtx.messageRole === MessageRole.USER}
- showModelSelector={editCtx.messageRole === MessageRole.USER}
- onValueChange={editCtx.setContent}
+ attachments={editCtx.editedExtras}
onAttachmentRemove={handleAttachmentRemove}
- onUploadedFileRemove={handleUploadedFileRemove}
onFilesAdd={handleFilesAdd}
onSubmit={handleSubmit}
+ onUploadedFileRemove={handleUploadedFileRemove}
+ onValueChange={editCtx.setContent}
+ placeholder="Edit your message..."
+ showAddButton={editCtx.messageRole === MessageRole.USER}
+ showMcpPromptButton
+ showModelSelector={editCtx.messageRole === MessageRole.USER}
+ value={editCtx.editedContent}
/>
</div>
<div class="mt-2 flex w-full max-w-[80%] items-center justify-between">
{#if isUserMessage && editCtx.showSaveOnlyOption}
<div class="flex items-center gap-2">
- <Switch id="save-only-switch" bind:checked={saveWithoutRegenerate} class="scale-75" />
+ <Switch bind:checked={saveWithoutRegenerate} class="scale-75" id="save-only-switch" />
- <label for="save-only-switch" class="cursor-pointer text-xs text-muted-foreground">
+ <label class="cursor-pointer text-xs text-muted-foreground" for="save-only-switch">
Update without re-sending
</label>
</div>
{:else if isAssistantMessage}
<div class="flex items-center gap-2">
- <Switch id="branch-after-edit" bind:checked={branchAfterEdit} class="scale-75" />
+ <Switch bind:checked={branchAfterEdit} class="scale-75" id="branch-after-edit" />
- <label for="branch-after-edit" class="cursor-pointer text-xs text-muted-foreground">
+ <label class="cursor-pointer text-xs text-muted-foreground" for="branch-after-edit">
Branch conversation after edit
</label>
</div>
@@ -147,12 +147,12 @@
<DialogConfirmation
bind:open={showDiscardDialog}
- title="Discard changes?"
- description="You have unsaved changes. Are you sure you want to discard them?"
- confirmText="Discard"
cancelText="Keep editing"
- variant="destructive"
+ confirmText="Discard"
+ description="You have unsaved changes. Are you sure you want to discard them?"
icon={AlertTriangle}
- onConfirm={editCtx.cancel}
onCancel={() => (showDiscardDialog = false)}
+ onConfirm={editCtx.cancel}
+ title="Discard changes?"
+ variant="destructive"
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageReasoningBlock.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageReasoningBlock.svelte
index a0861fb961..31a63259d5 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageReasoningBlock.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageReasoningBlock.svelte
@@ -124,23 +124,23 @@
</script>
<CollapsibleContentBlock
- {open}
class="my-2"
icon={Lightbulb}
iconClass="h-3.5 w-3.5"
- {title}
- {subtitle}
- {shimmerTitle}
{onToggle}
+ {open}
+ {shimmerTitle}
+ {subtitle}
+ {title}
>
<div
bind:this={scrollEl}
- class="reasoning-content"
class:is-streaming={isPending}
+ class="reasoning-content"
onscroll={handleScrollEvent}
>
{#if currentConfig.renderThinkingAsMarkdown}
- <MarkdownContent content={section.content} class="text-muted-foreground" {attachments} />
+ <MarkdownContent {attachments} class="text-muted-foreground" content={section.content} />
{:else}
<div
class="text-[13px] leading-relaxed wrap-break-word whitespace-pre-wrap text-muted-foreground"
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatistics.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatistics.svelte
index 1358f01517..4d8b1da2b1 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatistics.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatistics.svelte
@@ -140,15 +140,15 @@
{#snippet child({ props })}
<button
{...props}
- type="button"
class="inline-flex h-5 w-5 items-center justify-center rounded-sm transition-colors {activeView ===
opts.view
? 'bg-background text-foreground shadow-sm'
: opts.disabled
? 'cursor-not-allowed opacity-40'
: 'hover:text-foreground'}"
- onclick={() => !opts.disabled && (activeView = opts.view)}
disabled={opts.disabled}
+ onclick={() => !opts.disabled && (activeView = opts.view)}
+ type="button"
>
<IconComponent class="h-3 w-3" />
@@ -208,85 +208,85 @@
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={WholeWord}
- value="{predictedTokens?.toLocaleString()} tokens"
tooltipLabel="Generated tokens"
+ value="{predictedTokens?.toLocaleString()} tokens"
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Clock}
- value={formattedTime}
tooltipLabel="Generation time"
+ value={formattedTime}
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Gauge}
- value="{tokensPerSecond.toFixed(2)} t/s"
tooltipLabel="Generation speed"
+ value="{tokensPerSecond.toFixed(2)} t/s"
/>
{:else if activeView === ChatMessageStatsView.TOOLS && hasAgenticStats}
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Wrench}
- value="{agenticTimings!.toolCallsCount} calls"
tooltipLabel="Tool calls executed"
+ value="{agenticTimings!.toolCallsCount} calls"
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Clock}
- value={formattedAgenticToolsTime}
tooltipLabel="Tool execution time"
+ value={formattedAgenticToolsTime}
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Gauge}
- value="{agenticToolsPerSecond.toFixed(2)} calls/s"
tooltipLabel="Tool execution rate"
+ value="{agenticToolsPerSecond.toFixed(2)} calls/s"
/>
{:else if activeView === ChatMessageStatsView.SUMMARY && hasAgenticStats}
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Layers}
- value="{agenticTimings!.turns} turns"
tooltipLabel="Agentic turns (LLM calls)"
+ value="{agenticTimings!.turns} turns"
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={WholeWord}
- value="{agenticTimings!.llm.predicted_n.toLocaleString()} tokens"
tooltipLabel="Total tokens generated"
+ value="{agenticTimings!.llm.predicted_n.toLocaleString()} tokens"
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Clock}
- value={formattedAgenticTotalTime}
tooltipLabel="Total time (LLM + tools)"
+ value={formattedAgenticTotalTime}
/>
{:else if hasPromptStats && (mode === ChatMessageStatisticsMode.READING || isSwitchable)}
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={WholeWord}
- value="{promptTokens} tokens"
tooltipLabel="Prompt tokens"
+ value="{promptTokens} tokens"
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Clock}
- value={formattedPromptTime ?? '0s'}
tooltipLabel="Prompt processing time"
+ value={formattedPromptTime ?? '0s'}
/>
<ChatMessageStatisticsBadge
class="bg-transparent"
icon={Gauge}
- value="{promptTokensPerSecond!.toFixed(2)} tokens/s"
tooltipLabel="Prompt processing speed"
+ value="{promptTokensPerSecond!.toFixed(2)} tokens/s"
/>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatisticsBadge.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatisticsBadge.svelte
index 0aa4cda877..3bde975815 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatisticsBadge.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatisticsBadge.svelte
@@ -32,6 +32,7 @@
</BadgeInfo>
{/snippet}
</Tooltip.Trigger>
+
<Tooltip.Content>
<p>{tooltipLabel}</p>
</Tooltip.Content>
diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte
index c32c66d911..45b863d66b 100644
--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte
@@ -227,14 +227,14 @@
<div>
{#each displayMessages as { isLastAssistantMessage, isLastUserMessage, message, nextAssistantMessage, siblingInfo, toolMessages } (message.id)}
<ChatMessage
- class="mx-auto mt-12 w-full max-w-3xl"
{chatActions}
- {message}
- {toolMessages}
+ class="mx-auto mt-12 w-full max-w-3xl"
{isLastAssistantMessage}
{isLastUserMessage}
+ {message}
{nextAssistantMessage}
{siblingInfo}
+ {toolMessages}
/>
{/each}
@@ -247,10 +247,10 @@
class="mx-auto mt-12 w-full max-w-[48rem]"
content={pendingContent}
extras={agenticStore.getPendingSteeringMessageExtras(convId)}
- onSendImmediately={() => chatStore.abortCurrentFlow(convId)}
+ onDelete={() => agenticStore.clearSteeringMessage(convId)}
onEdit={(newContent, extras) =>
agenticStore.injectSteeringMessage(convId, newContent, extras)}
- onDelete={() => agenticStore.clearSteeringMessage(convId)}
+ onSendImmediately={() => chatStore.abortCurrentFlow(convId)}
/>
{/if}
{:else if conversationsStore.activeConversation && chatStore.getPendingMessageContent(conversationsStore.activeConversation!.id)}
@@ -262,9 +262,9 @@
class="mx-auto mt-12 w-full max-w-[48rem]"
content={pendingContent}
extras={chatStore.getPendingMessageExtras(convId)}
- onSendImmediately={() => chatStore.abortCurrentFlow(convId)}
- onEdit={(newContent, extras) => chatStore.injectPendingMessage(convId, newContent, extras)}
onDelete={() => chatStore.clearPendingMessage(convId)}
+ onEdit={(newContent, extras) => chatStore.injectPendingMessage(convId, newContent, extras)}
+ onSendImmediately={() => chatStore.abortCurrentFlow(convId)}
/>
{/if}
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
index 7afb4c0cf0..3ad3f24685 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
@@ -294,8 +294,8 @@
<ServerLoadingSplash />
{:else}
<div
- class="chat-screen flex grow flex-col min-h-[calc(100dvh-1rem)] md:min-h-[calc(100dvh-1rem-var(--chat-tabs-offset,0px))] px-4 md:py-0 pt-12 pb-48 md:pb-4"
style:--chat-form-bottom-position={chatFormBottomPosition}
+ class="chat-screen flex grow flex-col min-h-[calc(100dvh-1rem)] md:min-h-[calc(100dvh-1rem-var(--chat-tabs-offset,0px))] px-4 md:py-0 pt-12 pb-48 md:pb-4"
ondragenter={dragAndDrop.dragHandlers.dragenter}
ondragleave={dragAndDrop.dragHandlers.dragleave}
ondragover={dragAndDrop.dragHandlers.dragover}
@@ -313,6 +313,7 @@
{/if}
<div
+ style:padding-top={!isEmpty ? 'var(--chat-form-padding-top)' : undefined}
class={[
'pointer-events-none md:sticky fixed mt-auto transition-all duration-200',
deviceStore.isStandalone
@@ -322,7 +323,6 @@
: 'bottom-2 right-2 left-2',
isEmpty ? 'md:bottom-[calc(50dvh-7rem)] 2xl:bottom-[calc(50dvh-4rem)]' : 'md:bottom-4'
]}
- style:padding-top={!isEmpty ? 'var(--chat-form-padding-top)' : undefined}
>
<ChatScreenGreeting {isEmpty} />
@@ -347,6 +347,7 @@
</div>
<ChatScreenForm
+ bind:uploadedFiles={fileUpload.uploadedFiles}
class="pointer-events-auto conversation-chat-form"
disabled={hasPropsError || chatStore.isEditing()}
{initialMessage}
@@ -356,18 +357,17 @@
onSend={handleSendMessage}
onStop={() => chatStore.stopGeneration()}
onSystemPromptAdd={handleSystemPromptAdd}
- bind:uploadedFiles={fileUpload.uploadedFiles}
/>
</div>
</div>
{/if}
<ChatScreenDialogsAndAlerts
- {showDeleteDialog}
- {handleDeleteConfirm}
- {showEmptyFileDialog}
- {emptyFileNames}
{activeErrorDialog}
- {handleErrorDialogOpenChange}
+ {emptyFileNames}
{fileUpload}
+ {handleDeleteConfirm}
+ {handleErrorDialogOpenChange}
+ {showDeleteDialog}
+ {showEmptyFileDialog}
/>
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenActionScrollDown.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenActionScrollDown.svelte
index 9d7a6ee559..655c34bb2f 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenActionScrollDown.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenActionScrollDown.svelte
@@ -8,12 +8,12 @@
<div class="pointer-events-auto flex justify-center relative h-0">
<ActionIcon
+ ariaLabel="Scroll to bottom"
+ class="h-9 w-9 rounded-full bg-muted/60 border border-border/20 shadow-sm text-accent-foreground absolute bottom-4"
icon={ArrowDown}
+ iconSize={ICON_CLASS_DEFAULT}
{onclick}
- ariaLabel="Scroll to bottom"
- tooltip="Scroll to bottom"
size="lg"
- iconSize={ICON_CLASS_DEFAULT}
- class="h-9 w-9 rounded-full bg-muted/60 border border-border/20 shadow-sm text-accent-foreground absolute bottom-4"
+ tooltip="Scroll to bottom"
/>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenDialogsAndAlerts.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenDialogsAndAlerts.svelte
index 667e8fed4b..feba9ee35d 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenDialogsAndAlerts.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenDialogsAndAlerts.svelte
@@ -26,14 +26,14 @@
<DialogConfirmation
bind:open={showDeleteDialog}
- title="Delete Conversation"
- description="Are you sure you want to delete this conversation? This action cannot be undone and will permanently remove all messages in this conversation."
- confirmText="Delete"
cancelText="Cancel"
- variant="destructive"
+ confirmText="Delete"
+ description="Are you sure you want to delete this conversation? This action cannot be undone and will permanently remove all messages in this conversation."
icon={Trash2}
- onConfirm={handleDeleteConfirm}
onCancel={() => (showDeleteDialog = false)}
+ onConfirm={handleDeleteConfirm}
+ title="Delete Conversation"
+ variant="destructive"
/>
<DialogEmptyFileAlert
@@ -47,8 +47,8 @@
/>
<DialogChatError
- message={activeErrorDialog?.message ?? ''}
contextInfo={activeErrorDialog?.contextInfo}
+ message={activeErrorDialog?.message ?? ''}
onOpenChange={handleErrorDialogOpenChange}
open={Boolean(activeErrorDialog)}
type={activeErrorDialog?.type ?? ErrorDialogType.SERVER}
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
index 4645029807..9825b4b90b 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
@@ -147,19 +147,19 @@
});
</script>
-<div class="chat-screen-form-wrapper" bind:this={formWrapperEl}>
+<div bind:this={formWrapperEl} class="chat-screen-form-wrapper">
<ChatForm
- class="mx-auto max-w-3xl {className}"
bind:this={chatFormRef}
- bind:value={message}
bind:uploadedFiles
+ bind:value={message}
+ class="mx-auto max-w-3xl {className}"
{disabled}
{isLoading}
- showMcpPromptButton
onFilesAdd={handleFilesAdd}
{onStop}
onSubmit={handleSubmit}
onSystemPromptClick={handleSystemPromptClick}
onUploadedFileRemove={handleUploadedFileRemove}
+ showMcpPromptButton
/>
</div>
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenServerError.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenServerError.svelte
index 2c5d1af10d..cf9f55fd7f 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenServerError.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenServerError.svelte
@@ -22,9 +22,9 @@
{#if !isLoadingModel}
<button
- onclick={() => serverStore.fetch()}
- disabled={serverStore.loading}
class="flex items-center gap-1.5 rounded-lg bg-destructive/20 px-2 py-1 text-xs font-medium hover:bg-destructive/30 disabled:opacity-50"
+ disabled={serverStore.loading}
+ onclick={() => serverStore.fetch()}
>
<RefreshCw class="h-3 w-3 {serverStore.loading ? 'animate-spin' : ''}" />
{serverStore.loading ? 'Retrying...' : 'Retry'}
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenStreamResumeStatus.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenStreamResumeStatus.svelte
index a8e0dcc196..4fd1023dd6 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenStreamResumeStatus.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenStreamResumeStatus.svelte
@@ -8,11 +8,12 @@
{#if state === StreamConnectionState.RESUMING}
<div
+ aria-live="polite"
class="pointer-events-auto mx-auto mt-2 mb-2 flex max-w-[48rem] items-center gap-2 rounded-md border border-blue-400/40 bg-blue-50/60 px-3 py-1.5 text-sm text-blue-700 dark:bg-blue-950/40 dark:text-blue-200"
role="status"
- aria-live="polite"
>
<Loader2 class="h-3.5 w-3.5 animate-spin" />
+
<span>Reconnecting to the stream...</span>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabs.svelte b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabs.svelte
index 763241c56d..423a746e49 100644
--- a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabs.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabs.svelte
@@ -81,27 +81,27 @@
</script>
<nav
+ aria-label="Open conversations"
class="group sticky pl-1 top-0 z-10 hidden md:block chat-tabs-fade transition-[padding] duration-200 ease-in-out pt-3.25 {uiStore.isSidebarExpanded
? CHAT_TABS_MAX_WIDTH.EXPANDED_SIDEBAR
: CHAT_TABS_MAX_WIDTH.COLLAPSED_SIDEBAR}"
- aria-label="Open conversations"
>
<div class="relative">
<ScrollCarousel
+ {carousel}
class="h-10"
containerClass="flex h-10 min-w-0 items-center"
innerClass="items-center gap-1.25"
- {carousel}
>
{#each tabs as tab (tab.id)}
<ChatTabsItem
- {tab}
isActive={tab.id === activeId}
isLoading={loadingIds.has(tab.id)}
onActivate={(id) => tabsStore.activate(id)}
+ onAuxClick={handleAuxClick}
onClose={handleClose}
onStop={handleStop}
- onAuxClick={handleAuxClick}
+ {tab}
/>
{/each}
@@ -115,6 +115,7 @@
? 'opacity-100'
: 'opacity-0'}"
></div>
+
<div
class="pointer-events-none absolute inset-y-0 right-0 z-[5] w-8 bg-gradient-to-l from-background to-transparent transition-opacity {carousel.canScrollRight
? 'opacity-100'
diff --git a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsItem.svelte b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsItem.svelte
index b76a88efe0..ba223c4ad0 100644
--- a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsItem.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsItem.svelte
@@ -67,12 +67,12 @@
)}
>
<a
- {href}
- class="absolute inset-0 z-0 rounded-lg"
- onclick={handleActivate}
- onauxclick={(e) => onAuxClick?.(tab.id, e)}
aria-current={isActive ? 'page' : undefined}
aria-label={tab.name}
+ class="absolute inset-0 z-0 rounded-lg"
+ {href}
+ onauxclick={(e) => onAuxClick?.(tab.id, e)}
+ onclick={handleActivate}
></a>
{#if isLoading}
@@ -81,9 +81,9 @@
{#snippet child({ props })}
<button
{...props}
+ aria-label="Stop generation"
class="stop-button relative z-10 flex h-5 w-5 shrink-0 cursor-pointer items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground"
onclick={(e) => handleActionClick(e, () => onStop?.(tab.id, e))}
- aria-label="Stop generation"
>
<Loader2
class="loading-icon {ICON_CLASS_SM} animate-spin transition-opacity duration-300 {contentOpacity}"
@@ -115,12 +115,12 @@
{#snippet child({ props })}
<button
{...props}
+ aria-label="Close tab"
class={cn(
'relative z-10 flex h-5 w-5 shrink-0 cursor-pointer items-center justify-center rounded-sm text-muted-foreground transition-opacity hover:bg-foreground/10 hover:text-foreground',
contentOpacity
)}
onclick={(e) => handleActionClick(e, () => onClose?.(tab.id))}
- aria-label="Close tab"
>
<X class={ICON_CLASS_SM} />
</button>
diff --git a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsNewChatButton.svelte b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsNewChatButton.svelte
index d62e551f78..52b28106fa 100644
--- a/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsNewChatButton.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatTabs/ChatTabsNewChatButton.svelte
@@ -15,9 +15,9 @@
{#snippet child({ props })}
<button
{...props}
+ aria-label="New chat"
class="backdrop-blur-lg flex h-8 w-8 mr-4 shrink-0 cursor-pointer items-center justify-center rounded-md transition-colors hover:bg-foreground/5"
{onclick}
- aria-label="New chat"
>
<Plus class="{ICON_CLASS_DEFAULT} opacity-40 transition-opacity group-hover:opacity-100" />
</button>
diff --git a/tools/ui/src/lib/components/app/content/CollapsibleContentBlock.svelte b/tools/ui/src/lib/components/app/content/CollapsibleContentBlock.svelte
index 042a83e0e2..c54b981cde 100644
--- a/tools/ui/src/lib/components/app/content/CollapsibleContentBlock.svelte
+++ b/tools/ui/src/lib/components/app/content/CollapsibleContentBlock.svelte
@@ -40,12 +40,12 @@
</script>
<Collapsible.Root
- {open}
+ class={cn('group/collapsible', 'my-0!', className)}
onOpenChange={(value) => {
open = value;
onToggle?.();
}}
- class={cn('group/collapsible', 'my-0!', className)}
+ {open}
>
<Collapsible.Trigger
class={cn(
@@ -56,10 +56,10 @@
<div class="flex min-w-0 items-start gap-2 text-muted-foreground">
{#if iconUrl}
<img
- src={iconUrl}
alt=""
class={cn('shrink-0 rounded-sm mt-0.75', iconClass)}
onerror={hideBrokenIcon}
+ src={iconUrl}
/>
{:else if IconComponent}
<IconComponent class={cn('shrink-0 text-muted-foreground/60 mt-0.75', iconClass)} />
diff --git a/tools/ui/src/lib/components/app/content/CollapsibleTerminalBlock.svelte b/tools/ui/src/lib/components/app/content/CollapsibleTerminalBlock.svelte
index 5995dcebc9..0ad6ea61fc 100644
--- a/tools/ui/src/lib/components/app/content/CollapsibleTerminalBlock.svelte
+++ b/tools/ui/src/lib/components/app/content/CollapsibleTerminalBlock.svelte
@@ -40,12 +40,12 @@
</script>
<Collapsible.Root
- {open}
+ class={cn('group/collapsible', 'overflow-hidden rounded-md', className)}
onOpenChange={(value) => {
open = value;
onToggle?.();
}}
- class={cn('group/collapsible', 'overflow-hidden rounded-md', className)}
+ {open}
style="background: var(--code-background); border: 1px solid color-mix(in oklch, var(--border) 30%, transparent);"
>
<Collapsible.Trigger
@@ -57,10 +57,10 @@
<div class="flex min-w-0 items-start gap-2 text-muted-foreground">
{#if iconUrl}
<img
- src={iconUrl}
alt=""
class={cn('shrink-0 rounded-sm mt-0.5', iconClass)}
onerror={hideBrokenIcon}
+ src={iconUrl}
/>
{:else if IconComponent}
<IconComponent class={cn('shrink-0 text-muted-foreground/60 mt-0.5', iconClass)} />
diff --git a/tools/ui/src/lib/components/app/content/MarkdownContent/MarkdownContent.svelte b/tools/ui/src/lib/components/app/content/MarkdownContent/MarkdownContent.svelte
index 2a1d617ba2..87b41bd00d 100644
--- a/tools/ui/src/lib/components/app/content/MarkdownContent/MarkdownContent.svelte
+++ b/tools/ui/src/lib/components/app/content/MarkdownContent/MarkdownContent.svelte
@@ -867,10 +867,10 @@
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
bind:this={containerRef}
- onclick={handleMermaidClick}
class="markdown-content {className}{settingsStore.config[SETTINGS_KEYS.FULL_HEIGHT_CODE_BLOCKS]
? ' full-height-code-blocks'
: ''}"
+ onclick={handleMermaidClick}
>
{#each renderedBlocks as block (block.id)}
<div class="markdown-block" {...{ [MARKDOWN_DATA_ATTRS.BLOCK_ID]: block.id }}>
@@ -893,14 +893,16 @@
<div class="mermaid-block-wrapper streaming-mermaid-block">
<div class="code-block-header">
<span class="code-language">mermaid</span>
+
<div class="code-block-actions">
<ActionIconCopyToClipboard
- text={incompleteCodeBlock.code}
- canCopy={false}
ariaLabel="Diagram incomplete"
+ canCopy={false}
+ text={incompleteCodeBlock.code}
/>
</div>
</div>
+
<div class="mermaid-loading-placeholder">
<span class="mermaid-loading-text">Generating diagram...</span>
</div>
@@ -909,14 +911,16 @@
<div class="svg-block-wrapper streaming-svg-block">
<div class="code-block-header">
<span class="code-language">svg</span>
+
<div class="code-block-actions">
<ActionIconCopyToClipboard
- text={incompleteCodeBlock.code}
- canCopy={false}
ariaLabel="Diagram incomplete"
+ canCopy={false}
+ text={incompleteCodeBlock.code}
/>
</div>
</div>
+
{#if liveSvgHtml}
<div class="svg-scroll-container">
<div class={SVG.BLOCK_CLASS}>
@@ -933,10 +937,11 @@
<div class="code-block-wrapper streaming-code-block relative">
<div class="code-block-header">
<span class="code-language">{incompleteCodeBlock.language || 'text'}</span>
+
<CodeBlockActions
code={incompleteCodeBlock.code}
- language={incompleteCodeBlock.language || 'text'}
disabled
+ language={incompleteCodeBlock.language || 'text'}
onPreview={(code, lang) => {
previewCode = code;
previewLanguage = lang;
@@ -961,16 +966,16 @@
</div>
<DialogCodePreview
- open={previewDialogOpen}
code={previewCode}
language={previewLanguage}
onOpenChange={handlePreviewDialogOpenChange}
+ open={previewDialogOpen}
/>
<DialogMermaidPreview
+ onOpenChange={handleMermaidPreviewOpenChange}
open={mermaidPreviewOpen}
svgHtml={mermaidPreviewSvgHtml}
- onOpenChange={handleMermaidPreviewOpenChange}
/>
<style>
diff --git a/tools/ui/src/lib/components/app/content/MermaidPreview.svelte b/tools/ui/src/lib/components/app/content/MermaidPreview.svelte
index 77d20ced3f..d227e39e3d 100644
--- a/tools/ui/src/lib/components/app/content/MermaidPreview.svelte
+++ b/tools/ui/src/lib/components/app/content/MermaidPreview.svelte
@@ -103,22 +103,22 @@
<div
class="mermaid-preview-diagram transform-origin-center inline-block min-h-fit min-w-fit will-change-transform {isDragging &&
'select-none'}"
- style="transform: translate({translateX}px, {translateY}px) scale({scale}); cursor: {isDragging
- ? 'grabbing'
- : 'grab'};"
onpointerdown={handlePointerDown}
+ onpointerleave={handlePointerUp}
onpointermove={handlePointerMove}
onpointerup={handlePointerUp}
- onpointerleave={handlePointerUp}
+ style="transform: translate({translateX}px, {translateY}px) scale({scale}); cursor: {isDragging
+ ? 'grabbing'
+ : 'grab'};"
>
<div bind:this={svgHost}></div>
</div>
<MermaidPreviewControls
- {scale}
- {svgHtml}
+ onResetView={resetView}
onZoomIn={zoomIn}
onZoomOut={zoomOut}
- onResetView={resetView}
+ {scale}
+ {svgHtml}
/>
</div>
diff --git a/tools/ui/src/lib/components/app/content/MermaidPreviewControls.svelte b/tools/ui/src/lib/components/app/content/MermaidPreviewControls.svelte
index 938da066c2..62cdbadea5 100644
--- a/tools/ui/src/lib/components/app/content/MermaidPreviewControls.svelte
+++ b/tools/ui/src/lib/components/app/content/MermaidPreviewControls.svelte
@@ -34,42 +34,46 @@
>
<div class="mermaid-preview-controls-inner flex items-center gap-1 rounded-lg bg-muted p-1">
<button
+ aria-label="Zoom out"
class="mermaid-preview-btn flex h-8 w-8 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent text-foreground transition-colors hover:bg-muted-foreground/15 active:bg-muted-foreground/25"
onclick={onZoomOut}
title="Zoom out"
- aria-label="Zoom out"
>
<ZoomOutIcon class="mermaid-preview-btn-icon {ICON_CLASS_DEFAULT}" />
</button>
+
<span
class="mermaid-preview-zoom-label min-w-[3.5rem] px-0.5 text-center text-xs font-medium text-muted-foreground tabular-nums select-none"
>{Math.round(scale * 100)}%</span
>
+
<button
+ aria-label="Zoom in"
class="mermaid-preview-btn flex h-8 w-8 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent text-foreground transition-colors hover:bg-muted-foreground/15 active:bg-muted-foreground/25"
onclick={onZoomIn}
title="Zoom in"
- aria-label="Zoom in"
>
<ZoomInIcon class="mermaid-preview-btn-icon {ICON_CLASS_DEFAULT}" />
</button>
+
<div class="mermaid-preview-controls-separator mx-1 h-5 w-px bg-border/50"></div>
<button
+ aria-label="Reset view"
class="mermaid-preview-btn flex h-8 w-8 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent text-foreground transition-colors hover:bg-muted-foreground/15 active:bg-muted-foreground/25"
onclick={onResetView}
title="Reset view"
- aria-label="Reset view"
>
<RotateCcwIcon class="mermaid-preview-btn-icon {ICON_CLASS_DEFAULT}" />
</button>
+
<div class="mermaid-preview-controls-separator mx-1 h-5 w-px bg-border/50"></div>
<button
+ aria-label="Download SVG"
class="mermaid-preview-btn flex h-8 w-8 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent text-foreground transition-colors hover:bg-muted-foreground/15 active:bg-muted-foreground/25"
onclick={downloadSvg}
title="Download SVG"
- aria-label="Download SVG"
>
<Download class="mermaid-preview-btn-icon {ICON_CLASS_DEFAULT}" />
</button>
diff --git a/tools/ui/src/lib/components/app/content/SyntaxHighlightedCode.svelte b/tools/ui/src/lib/components/app/content/SyntaxHighlightedCode.svelte
index a879197a28..e88e0d4cdf 100644
--- a/tools/ui/src/lib/components/app/content/SyntaxHighlightedCode.svelte
+++ b/tools/ui/src/lib/components/app/content/SyntaxHighlightedCode.svelte
@@ -129,8 +129,8 @@
<div
bind:this={scrollEl}
- onscroll={handleScrollEvent}
class="code-preview-wrapper min-w-0 max-w-full overflow-auto rounded-xl border shadow-[0_1px_2px_0_rgb(0_0_0_/_0.05)] {className}"
+ onscroll={handleScrollEvent}
style="border-color: color-mix(in oklch, var(--border) 30%, transparent); background: var(--code-background); max-height: {maxHeight}; {maxWidth
? `max-width: ${maxWidth};`
: ''}"
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogChatAttachmentsPreview.svelte b/tools/ui/src/lib/components/app/dialogs/DialogChatAttachmentsPreview.svelte
index e0b4138baa..5ce0de9ae6 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogChatAttachmentsPreview.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogChatAttachmentsPreview.svelte
@@ -70,19 +70,19 @@
<Dialog.Content class="fixed inset-0 z-[1000] flex flex-col bg-transparent outline-none">
<Dialog.Close
+ aria-label="Close"
class="absolute top-4 right-4 z-10 cursor-pointer text-white hover:text-gray-400"
onclick={handleClose}
- aria-label="Close"
>
<X class="size-4" />
</Dialog.Close>
<ChatAttachmentsPreview
- {uploadedFiles}
- {attachments}
{activeModelId}
- {previewFocusIndex}
+ {attachments}
class="min-h-0 flex-1"
+ {previewFocusIndex}
+ {uploadedFiles}
/>
</Dialog.Content>
</Dialog.Portal>
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogChatError.svelte b/tools/ui/src/lib/components/app/dialogs/DialogChatError.svelte
index c2429fe4df..76a470cfa3 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogChatError.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogChatError.svelte
@@ -33,7 +33,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title class="flex items-center gap-2">
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogCodePreview.svelte b/tools/ui/src/lib/components/app/dialogs/DialogCodePreview.svelte
index 3c6012d823..4bd5988a09 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogCodePreview.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogCodePreview.svelte
@@ -30,21 +30,21 @@
}
</script>
-<DialogPrimitive.Root {open} onOpenChange={handleOpenChange}>
+<DialogPrimitive.Root onOpenChange={handleOpenChange} {open}>
<DialogPrimitive.Portal>
<DialogPrimitive.Overlay class="code-preview-overlay" />
<DialogPrimitive.Content class="code-preview-content">
<iframe
bind:this={iframeRef}
- title="Preview {language}"
- sandbox="allow-scripts"
class="code-preview-iframe"
+ sandbox="allow-scripts"
+ title="Preview {language}"
></iframe>
<DialogPrimitive.Close
- class="code-preview-close absolute top-4 right-4 border-none bg-transparent text-white opacity-70 mix-blend-difference transition-opacity hover:opacity-100 focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:outline-none disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-8"
aria-label="Close preview"
+ class="code-preview-close absolute top-4 right-4 border-none bg-transparent text-white opacity-70 mix-blend-difference transition-opacity hover:opacity-100 focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:outline-none disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-8"
>
<XIcon />
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogConfirmation.svelte b/tools/ui/src/lib/components/app/dialogs/DialogConfirmation.svelte
index 409cbc3a96..8a503208f0 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogConfirmation.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogConfirmation.svelte
@@ -48,7 +48,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Content onkeydown={handleKeydown}>
<AlertDialog.Header>
<AlertDialog.Title class="flex items-center gap-2">
@@ -71,9 +71,10 @@
<AlertDialog.Footer>
<AlertDialog.Cancel onclick={onCancel}>{cancelText}</AlertDialog.Cancel>
+
<AlertDialog.Action
- onclick={onConfirm}
class={variant === 'destructive' ? 'bg-destructive text-white hover:bg-destructive/80' : ''}
+ onclick={onConfirm}
>
{confirmText}
</AlertDialog.Action>
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogConversationRename.svelte b/tools/ui/src/lib/components/app/dialogs/DialogConversationRename.svelte
index e4c4e0bbc3..d83c5f0fe6 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogConversationRename.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogConversationRename.svelte
@@ -61,19 +61,19 @@
<AlertDialog.Description>Choose a new title for this conversation.</AlertDialog.Description>
</AlertDialog.Header>
- <form onsubmit={handleSubmit} class="space-y-2 pt-2 pb-4">
- <label for="conversation-rename-input" class="text-sm font-medium text-muted-foreground">
+ <form class="space-y-2 pt-2 pb-4" onsubmit={handleSubmit}>
+ <label class="text-sm font-medium text-muted-foreground" for="conversation-rename-input">
Conversation title
</label>
<Input
- id="conversation-rename-input"
bind:ref={inputRef}
bind:value
- placeholder="Conversation title"
- maxlength={200}
autocomplete="off"
autocorrect="off"
+ id="conversation-rename-input"
+ maxlength={200}
+ placeholder="Conversation title"
spellcheck={false}
/>
</form>
@@ -81,7 +81,7 @@
<AlertDialog.Footer>
<AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
- <Button type="button" onclick={handleSubmit} disabled={!canSubmit}>Save</Button>
+ <Button disabled={!canSubmit} onclick={handleSubmit} type="button">Save</Button>
</AlertDialog.Footer>
</AlertDialog.Content>
</AlertDialog.Root>
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogConversationSelection.svelte b/tools/ui/src/lib/components/app/dialogs/DialogConversationSelection.svelte
index 4e40591ce9..6e6260eb16 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogConversationSelection.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogConversationSelection.svelte
@@ -58,8 +58,8 @@
<ConversationSelection
bind:this={conversationSelectionRef}
- isOpen={open}
{conversations}
+ isOpen={open}
{messageCountMap}
{mode}
{onCancel}
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogEmptyFileAlert.svelte b/tools/ui/src/lib/components/app/dialogs/DialogEmptyFileAlert.svelte
index 9e1c8057a8..14417d59a8 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogEmptyFileAlert.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogEmptyFileAlert.svelte
@@ -16,7 +16,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title class="flex items-center gap-2">
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogExportSettings.svelte b/tools/ui/src/lib/components/app/dialogs/DialogExportSettings.svelte
index 3b11e5dad4..79bfc1ee08 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogExportSettings.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogExportSettings.svelte
@@ -23,7 +23,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title class="flex items-center gap-2">
@@ -52,11 +52,11 @@
</AlertDialog.Header>
<div class="flex items-center gap-2 py-2">
- <Checkbox id="include-sensitive" bind:checked={includeSensitiveData} />
+ <Checkbox bind:checked={includeSensitiveData} id="include-sensitive" />
<Label
- for="include-sensitive"
class="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+ for="include-sensitive"
>
{#if includeSensitiveData}
<span class="text-destructive">Include sensitive data (not recommended)</span>
@@ -70,8 +70,8 @@
<AlertDialog.Cancel onclick={onCancel}>Cancel</AlertDialog.Cancel>
<AlertDialog.Action
- onclick={onConfirm}
class="bg-destructive text-white hover:bg-destructive/80"
+ onclick={onConfirm}
>
{#if includeSensitiveData}
Export Anyway
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogFileUploadError.svelte b/tools/ui/src/lib/components/app/dialogs/DialogFileUploadError.svelte
index 0d5a9984cb..1d747bf9c8 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogFileUploadError.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogFileUploadError.svelte
@@ -21,7 +21,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Portal>
<AlertDialog.Overlay />
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcePreview.svelte b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcePreview.svelte
index 370676676f..a5f9674edf 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcePreview.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcePreview.svelte
@@ -64,12 +64,12 @@
·
{#if favicon}
<img
- src={favicon}
alt=""
class="h-3 w-3 shrink-0 rounded-sm"
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={favicon}
/>
{/if}
{serverName}
@@ -85,18 +85,18 @@
<div class="flex items-center justify-end gap-1">
<ActionIconCopyToClipboard
- text={extra.content}
- canCopy={!!extra.content}
ariaLabel="Copy content"
+ canCopy={!!extra.content}
+ text={extra.content}
/>
<Button
- variant="ghost"
- size="sm"
class="h-7 w-7 p-0"
- onclick={handleDownload}
disabled={!extra.content}
+ onclick={handleDownload}
+ size="sm"
title="Download content"
+ variant="ghost"
>
<Download class="h-3.5 w-3.5" />
</Button>
@@ -106,11 +106,11 @@
{#if isImageResource(extra.mimeType, extra.uri) && extra.content}
<div class="flex items-center justify-center">
<img
+ alt={extra.name}
+ class="max-h-[70vh] max-w-full rounded object-contain"
src={extra.content.startsWith('data:')
? extra.content
: `data:${extra.mimeType || 'image/png'};base64,${extra.content}`}
- alt={extra.name}
- class="max-h-[70vh] max-w-full rounded object-contain"
/>
</div>
{:else if isCodeResource(extra.mimeType, extra.uri) && extra.content}
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte
index c48dcb38c7..8804cb7ea7 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte
@@ -252,7 +252,7 @@
);
</script>
-<Dialog.Root {open} onOpenChange={handleOpenChange}>
+<Dialog.Root onOpenChange={handleOpenChange} {open}>
<Dialog.Content class="max-h-[80vh] !max-w-4xl overflow-hidden p-0">
<Dialog.Header class="border-b border-border/30 px-6 py-4">
<Dialog.Title class="flex items-center gap-2">
@@ -273,12 +273,12 @@
<div class="flex h-[500px] min-w-0">
<div class="w-72 shrink-0 overflow-y-auto border-r border-border/30 p-4">
<McpResourcesBrowser
+ expandToUri={preSelectedUri}
onSelect={handleResourceSelect}
- onToggle={handleResourceToggle}
onTemplateSelect={handleTemplateSelect}
- selectedUris={selectedResources}
+ onToggle={handleResourceToggle}
{selectedTemplateUri}
- expandToUri={preSelectedUri}
+ selectedUris={selectedResources}
/>
</div>
@@ -314,32 +314,32 @@
<span class="text-sm">{templatePreviewError}</span>
<Button
- size="sm"
- variant="outline"
onclick={() => {
templatePreviewError = null;
}}
+ size="sm"
+ variant="outline"
>
Try again
</Button>
</div>
{:else}
<McpResourceTemplateForm
- template={selectedTemplate}
- onResolve={handleTemplateResolve}
onCancel={handleTemplateCancelForm}
+ onResolve={handleTemplateResolve}
+ template={selectedTemplate}
/>
{/if}
</div>
{:else if hasTemplateResult}
<!-- Template resolved: show preview -->
<McpResourcePreview
+ preloadedContent={templatePreviewContent}
resource={{
name: templatePreviewUri?.split('/').pop() || (templatePreviewUri ?? ''),
serverName: selectedTemplate?.serverName || '',
uri: templatePreviewUri ?? ''
}}
- preloadedContent={templatePreviewContent}
/>
{:else if selectedResources.size === 1}
{@const allResources = getAllResourcesFlatInTreeOrder()}
@@ -363,10 +363,10 @@
</div>
<Dialog.Footer class="border-t border-border/30 px-6 py-4">
- <Button variant="outline" onclick={() => handleOpenChange(false)}>Cancel</Button>
+ <Button onclick={() => handleOpenChange(false)} variant="outline">Cancel</Button>
{#if hasTemplateResult}
- <Button onclick={handleAttachTemplateResource} disabled={isAttaching}>
+ <Button disabled={isAttaching} onclick={handleAttachTemplateResource}>
{#if isAttaching}
<Loader2 class="mr-2 {ICON_CLASS_DEFAULT} animate-spin" />
{:else}
@@ -376,7 +376,7 @@
Attach Resource
</Button>
{:else}
- <Button onclick={handleAttach} disabled={selectedResources.size === 0 || isAttaching}>
+ <Button disabled={selectedResources.size === 0 || isAttaching} onclick={handleAttach}>
{#if isAttaching}
<Loader2 class="mr-2 {ICON_CLASS_DEFAULT} animate-spin" />
{:else}
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte b/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte
index a339c6a429..ae8b24cb2d 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte
@@ -245,7 +245,7 @@
}
</script>
-<Dialog.Root {open} onOpenChange={handleOpenChange}>
+<Dialog.Root onOpenChange={handleOpenChange} {open}>
<Dialog.Content class="sm:max-w-2xl">
<Dialog.Header>
<Dialog.Title class="select-none">Add New MCP Server</Dialog.Title>
@@ -255,7 +255,8 @@
<div class="space-y-3 pt-2">
<div class="flex items-center justify-between gap-3">
<h3 class="text-sm font-medium">Recommended Servers</h3>
- <Button class="text-muted-foreground" variant="ghost" size="sm" onclick={handleDismissAll}
+
+ <Button class="text-muted-foreground" onclick={handleDismissAll} size="sm" variant="ghost"
>Dismiss</Button
>
</div>
@@ -263,40 +264,40 @@
<div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
{#each recommendationsToShow as recommendation (recommendation.id)}
<McpServerCardCompact
- server={recommendation}
+ dimmed={hasSelection && selectedRecommendationId !== recommendation.id}
onClick={() => handleRecommendationClick(recommendation.id)}
selected={selectedRecommendationId === recommendation.id}
- dimmed={hasSelection && selectedRecommendationId !== recommendation.id}
+ server={recommendation}
/>
{/each}
</div>
</div>
{/if}
- <form onsubmit={handleSubmit} class="contents">
+ <form class="contents" onsubmit={handleSubmit}>
<div class="space-y-4 py-4">
<McpServerForm
- url={newServerUrl}
+ bind:wantsAuthorization={newServerWantsAuthorization}
+ headers={newServerHeaders}
+ id="new-server"
name={newServerName}
+ onHeadersChange={(v) => (newServerHeaders = v)}
onNameChange={handleNameChange}
- headers={newServerHeaders}
- useProxy={newServerUseProxy}
onUrlChange={(v) => (newServerUrl = v)}
- onHeadersChange={(v) => (newServerHeaders = v)}
onUseProxyChange={(v) => (newServerUseProxy = v)}
- urlError={newServerUrl ? newServerUrlError : null}
- id="new-server"
- bind:wantsAuthorization={newServerWantsAuthorization}
required={authRequired}
+ url={newServerUrl}
+ urlError={newServerUrl ? newServerUrlError : null}
+ useProxy={newServerUseProxy}
/>
</div>
<Dialog.Footer>
- <Button variant="secondary" size="sm" onclick={() => handleOpenChange(false)}>
+ <Button onclick={() => handleOpenChange(false)} size="sm" variant="secondary">
Cancel
</Button>
- <Button variant="default" size="sm" type="submit" disabled={!canSave} aria-label="Save">
+ <Button aria-label="Save" disabled={!canSave} size="sm" type="submit" variant="default">
Add
</Button>
</Dialog.Footer>
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte b/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte
index fb74988702..811c24d6b7 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte
@@ -108,21 +108,22 @@
<Table.Head>
<div class="inline-flex items-center gap-2">
<span
- class="resizable-text-container min-w-0 flex-1 truncate"
style:--threshold="12rem"
+ class="resizable-text-container min-w-0 flex-1 truncate"
>
{modelName}
</span>
<ActionIconCopyToClipboard
- text={modelName || ''}
- canCopy={!!modelName}
ariaLabel="Copy model name to clipboard"
+ canCopy={!!modelName}
+ text={modelName || ''}
/>
</div>
</Table.Head>
</Table.Row>
</Table.Header>
+
<Table.Body>
<!-- Model Path -->
<Table.Row>
@@ -132,15 +133,15 @@
class="inline-flex h-10 items-center gap-2 align-middle font-mono text-xs"
>
<span
- class="resizable-text-container min-w-0 flex-1 truncate"
style:--threshold="14rem"
+ class="resizable-text-container min-w-0 flex-1 truncate"
>
{serverProps.model_path}
</span>
<ActionIconCopyToClipboard
- text={serverProps.model_path}
ariaLabel="Copy model path to clipboard"
+ text={serverProps.model_path}
/>
</Table.Cell>
</Table.Row>
@@ -213,6 +214,7 @@
{#if modelMeta?.vocab_type}
<Table.Row>
<Table.Cell class="align-middle font-medium">Vocabulary Type</Table.Cell>
+
<Table.Cell class="align-middle capitalize">{modelMeta.vocab_type}</Table.Cell>
</Table.Row>
{/if}
diff --git a/tools/ui/src/lib/components/app/dialogs/DialogModelNotAvailable.svelte b/tools/ui/src/lib/components/app/dialogs/DialogModelNotAvailable.svelte
index 1f0ac2fca4..5bbef29239 100644
--- a/tools/ui/src/lib/components/app/dialogs/DialogModelNotAvailable.svelte
+++ b/tools/ui/src/lib/components/app/dialogs/DialogModelNotAvailable.svelte
@@ -30,7 +30,7 @@
}
</script>
-<AlertDialog.Root {open} onOpenChange={handleOpenChange}>
+<AlertDialog.Root onOpenChange={handleOpenChange} {open}>
<AlertDialog.Content class="max-w-lg">
<AlertDialog.Header>
<AlertDialog.Title class="flex items-center gap-2">
@@ -53,14 +53,16 @@
{#if availableModels.length > 0}
<div class="text-sm">
<p class="mb-2 font-medium text-muted-foreground">Select an available model:</p>
+
<div class="max-h-48 space-y-1 overflow-y-auto rounded-md border p-1">
{#each availableModels as model (model)}
<button
- type="button"
class="group flex w-full items-center justify-between gap-2 rounded-sm px-3 py-2 text-left text-sm transition-colors hover:bg-accent hover:text-accent-foreground"
onclick={() => handleSelectModel(model)}
+ type="button"
>
<span class="min-w-0 truncate font-mono text-xs">{model}</span>
+
<ArrowRight
class="{ICON_CLASS_DEFAULT} shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100"
/>
diff --git a/tools/ui/src/lib/components/app/forms/InputWithSuggestions.svelte b/tools/ui/src/lib/components/app/forms/InputWithSuggestions.svelte
index 6134067964..6690724f3d 100644
--- a/tools/ui/src/lib/components/app/forms/InputWithSuggestions.svelte
+++ b/tools/ui/src/lib/components/app/forms/InputWithSuggestions.svelte
@@ -33,7 +33,7 @@
</script>
<div class="relative grid gap-1">
- <Label for="tpl-arg-{name}" class="mb-1 text-muted-foreground">
+ <Label class="mb-1 text-muted-foreground" for="tpl-arg-{name}">
<span>
{name}
@@ -46,29 +46,29 @@
</Label>
<Input
+ autocomplete="off"
id="tpl-arg-{name}"
- type="text"
- {value}
- oninput={(e) => onInput(e.currentTarget.value)}
- onkeydown={onKeydown}
onblur={onBlur}
onfocus={onFocus}
+ oninput={(e) => onInput(e.currentTarget.value)}
+ onkeydown={onKeydown}
placeholder="Enter {name}"
- autocomplete="off"
+ type="text"
+ {value}
/>
{#if isAutocompleteActive && suggestions.length > 0}
<div
- class="absolute top-full right-0 left-0 z-10 mt-1 max-h-32 overflow-y-auto rounded-lg border border-border/50 bg-background shadow-lg"
transition:fly={{ duration: 100, y: -5 }}
+ class="absolute top-full right-0 left-0 z-10 mt-1 max-h-32 overflow-y-auto rounded-lg border border-border/50 bg-background shadow-lg"
>
{#each suggestions as suggestion, i (suggestion)}
<button
- type="button"
- onmousedown={() => onSelectSuggestion(suggestion)}
class="w-full px-3 py-1.5 text-left text-sm hover:bg-accent {i === autocompleteIndex
? 'bg-accent'
: ''}"
+ onmousedown={() => onSelectSuggestion(suggestion)}
+ type="button"
>
{suggestion}
</button>
diff --git a/tools/ui/src/lib/components/app/forms/KeyValuePairs.svelte b/tools/ui/src/lib/components/app/forms/KeyValuePairs.svelte
index f83f53d944..9bd275611c 100644
--- a/tools/ui/src/lib/components/app/forms/KeyValuePairs.svelte
+++ b/tools/ui/src/lib/components/app/forms/KeyValuePairs.svelte
@@ -113,9 +113,9 @@
{/if}
<button
- type="button"
class="inline-flex cursor-pointer items-center gap-1 rounded-md px-1.5 py-1 text-xs text-muted-foreground hover:bg-muted hover:text-foreground"
onclick={addPair}
+ type="button"
>
<Plus class="h-3 w-3" />
{addButtonLabel}
@@ -128,34 +128,34 @@
<div class="flex items-start gap-2">
<Input
bind:ref={keyInputRefs[index]}
- type="text"
- placeholder={keyPlaceholder}
- value={pair.key}
+ class="flex-1"
maxlength={KEY_VALUE_PAIR_KEY_MAX_LENGTH}
- oninput={(e) => updatePairKey(index, e.currentTarget.value)}
onblur={(e) => trimPairKey(index, e.currentTarget.value)}
- class="flex-1"
+ oninput={(e) => updatePairKey(index, e.currentTarget.value)}
+ placeholder={keyPlaceholder}
+ type="text"
+ value={pair.key}
/>
<textarea
use:autoResizeTextarea
- placeholder={valuePlaceholder}
- value={pair.value}
+ class="flex-1 resize-none rounded-md border border-input bg-transparent px-3 py-2 text-sm leading-5 placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none"
maxlength={KEY_VALUE_PAIR_VALUE_MAX_LENGTH}
+ onblur={(e) => trimPairValue(index, e.currentTarget.value)}
oninput={(e) => {
updatePairValue(index, e.currentTarget.value);
autoResizeTextarea(e.currentTarget);
}}
- onblur={(e) => trimPairValue(index, e.currentTarget.value)}
- class="flex-1 resize-none rounded-md border border-input bg-transparent px-3 py-2 text-sm leading-5 placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none"
+ placeholder={valuePlaceholder}
rows="1"
+ value={pair.value}
></textarea>
<button
- type="button"
+ aria-label="Remove item"
class="mt-1.5 shrink-0 cursor-pointer rounded-md p-1 text-muted-foreground hover:bg-destructive/10 hover:text-destructive"
onclick={() => removePair(index)}
- aria-label="Remove item"
+ type="button"
>
<Trash2 class="h-3.5 w-3.5" />
</button>
diff --git a/tools/ui/src/lib/components/app/forms/SearchInput.svelte b/tools/ui/src/lib/components/app/forms/SearchInput.svelte
index 1ed68a075f..99d261208f 100644
--- a/tools/ui/src/lib/components/app/forms/SearchInput.svelte
+++ b/tools/ui/src/lib/components/app/forms/SearchInput.svelte
@@ -55,11 +55,11 @@
/>
<Input
- {autofocus}
- {id}
- bind:value
bind:ref
+ bind:value
+ {autofocus}
class="pl-9 {showClearButton ? 'pr-9' : ''}"
+ {id}
oninput={handleInput}
onkeydown={onKeyDown}
{placeholder}
@@ -68,10 +68,10 @@
{#if showClearButton}
<button
- type="button"
+ aria-label={value ? 'Clear search' : 'Close'}
class="absolute top-1/2 right-3 -translate-y-1/2 transform cursor-pointer text-muted-foreground transition-colors hover:text-foreground"
onclick={handleClear}
- aria-label={value ? 'Clear search' : 'Close'}
+ type="button"
>
<X class={ICON_CLASS_DEFAULT} />
</button>
diff --git a/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte b/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte
index a8772aa1c9..ea274d5aa7 100644
--- a/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte
@@ -68,15 +68,16 @@
<Tooltip.Trigger>
<div class="box-shadow-lg overflow-hidden rounded-full bg-muted ring-1 ring-muted">
<img
- src={favicon.url}
alt=""
class={ICON_CLASS_DEFAULT}
onerror={(e) => {
(e.currentTarget as HTMLImageElement).style.display = 'none';
}}
+ src={favicon.url}
/>
</div>
</Tooltip.Trigger>
+
<Tooltip.Content>
<p>{favicon.name}</p>
</Tooltip.Content>
diff --git a/tools/ui/src/lib/components/app/mcp/McpCapabilitiesBadges.svelte b/tools/ui/src/lib/components/app/mcp/McpCapabilitiesBadges.svelte
index ae3ad0072a..632cd3e8a7 100644
--- a/tools/ui/src/lib/components/app/mcp/McpCapabilitiesBadges.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpCapabilitiesBadges.svelte
@@ -12,7 +12,7 @@
{#if capabilities}
{#if capabilities.server.tools}
- <Badge variant="outline" class="h-5 gap-1 bg-green-50 px-1.5 text-[10px] dark:bg-green-950">
+ <Badge class="h-5 gap-1 bg-green-50 px-1.5 text-[10px] dark:bg-green-950" variant="outline">
<Wrench class="h-3 w-3 text-green-600 dark:text-green-400" />
Tools
@@ -20,7 +20,7 @@
{/if}
{#if capabilities.server.resources}
- <Badge variant="outline" class="h-5 gap-1 bg-blue-50 px-1.5 text-[10px] dark:bg-blue-950">
+ <Badge class="h-5 gap-1 bg-blue-50 px-1.5 text-[10px] dark:bg-blue-950" variant="outline">
<Database class="h-3 w-3 text-blue-600 dark:text-blue-400" />
Resources
@@ -28,7 +28,7 @@
{/if}
{#if capabilities.server.prompts}
- <Badge variant="outline" class="h-5 gap-1 bg-purple-50 px-1.5 text-[10px] dark:bg-purple-950">
+ <Badge class="h-5 gap-1 bg-purple-50 px-1.5 text-[10px] dark:bg-purple-950" variant="outline">
<MessageSquare class="h-3 w-3 text-purple-600 dark:text-purple-400" />
Prompts
@@ -36,7 +36,7 @@
{/if}
{#if capabilities.server.logging}
- <Badge variant="outline" class="h-5 gap-1 bg-orange-50 px-1.5 text-[10px] dark:bg-orange-950">
+ <Badge class="h-5 gap-1 bg-orange-50 px-1.5 text-[10px] dark:bg-orange-950" variant="outline">
<FileText class="h-3 w-3 text-orange-600 dark:text-orange-400" />
Logging
@@ -44,7 +44,7 @@
{/if}
{#if capabilities.server.completions}
- <Badge variant="outline" class="h-5 gap-1 bg-cyan-50 px-1.5 text-[10px] dark:bg-cyan-950">
+ <Badge class="h-5 gap-1 bg-cyan-50 px-1.5 text-[10px] dark:bg-cyan-950" variant="outline">
<Sparkles class="h-3 w-3 text-cyan-600 dark:text-cyan-400" />
Completions
@@ -52,7 +52,7 @@
{/if}
{#if capabilities.server.tasks}
- <Badge variant="outline" class="h-5 gap-1 bg-pink-50 px-1.5 text-[10px] dark:bg-pink-950">
+ <Badge class="h-5 gap-1 bg-pink-50 px-1.5 text-[10px] dark:bg-pink-950" variant="outline">
<ListChecks class="h-3 w-3 text-pink-600 dark:text-pink-400" />
Tasks
diff --git a/tools/ui/src/lib/components/app/mcp/McpLogo.svelte b/tools/ui/src/lib/components/app/mcp/McpLogo.svelte
index 9f73db84d6..832b758e52 100644
--- a/tools/ui/src/lib/components/app/mcp/McpLogo.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpLogo.svelte
@@ -4,25 +4,25 @@
<svg
class={className}
+ fill="none"
{style}
- xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
viewBox="0 0 174 174"
+ xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
- fill="none"
- version="1.1"
><g id="shape-320b5b95-d08d-8089-8007-585a8e498184"
><defs
><clipPath
- id="frame-clip-320b5b95-d08d-8089-8007-585a8e498184-render-1"
class="frame-clip frame-clip-def"
+ id="frame-clip-320b5b95-d08d-8089-8007-585a8e498184-render-1"
><rect
+ height="174"
rx="0"
ry="0"
+ transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"
+ width="174.00000000000045"
x="0"
y="0"
- width="174.00000000000045"
- height="174"
- transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"
/></clipPath
></defs
><g class="frame-container-wrapper"
@@ -31,14 +31,14 @@
><g clip-path="url(#frame-clip-320b5b95-d08d-8089-8007-585a8e498184-render-1)" fill="none"
><g class="fills" id="fills-320b5b95-d08d-8089-8007-585a8e498184"
><rect
+ class="frame-background"
+ height="174"
rx="0"
ry="0"
+ transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"
+ width="174.00000000000045"
x="0"
y="0"
- width="174.00000000000045"
- height="174"
- transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"
- class="frame-background"
/></g
><g class="frame-children"
><g id="shape-320b5b95-d08d-8089-8007-585a974337b1"
@@ -50,10 +50,10 @@
style="fill: none;"
/></g
><g
+ class="strokes"
fill="none"
- stroke-linecap="round"
id="strokes-b954dcef-3e3e-8015-8007-585acd4382b6-320b5b95-d08d-8089-8007-585a974337b1"
- class="strokes"
+ stroke-linecap="round"
><g class="stroke-shape"
><path
d="M15.5587158203125,81.5927734375L83.44091796875,13.7105712890625C92.813720703125,4.3380126953125,108.0096435546875,4.3380126953125,117.3817138671875,13.7105712890625L117.3817138671875,13.7105712890625C126.7547607421875,23.08306884765625,126.7547607421875,38.27911376953125,117.3817138671875,47.65167236328125L66.1168212890625,98.9169921875"
@@ -70,10 +70,10 @@
style="fill: none;"
/></g
><g
+ class="strokes"
fill="none"
- stroke-linecap="round"
id="strokes-b954dcef-3e3e-8015-8007-585acd447743-320b5b95-d08d-8089-8007-585a974337b2"
- class="strokes"
+ stroke-linecap="round"
><g class="stroke-shape"
><path
d="M66.5587158203125,98.26885986328125L117.1165771484375,47.7105712890625C126.489501953125,38.3380126953125,141.6854248046875,38.3380126953125,151.0584716796875,47.7105712890625L151.4114990234375,48.0640869140625C160.7845458984375,57.43670654296875,160.7845458984375,72.6326904296875,151.4114990234375,82.00518798828125L90.018310546875,143.39886474609375C86.8941650390625,146.52288818359375,86.8941650390625,151.587890625,90.018310546875,154.71185302734375L102.62451171875,167.31890869140625"
@@ -90,10 +90,10 @@
style="fill: none;"
/></g
><g
+ class="strokes"
fill="none"
- stroke-linecap="round"
id="strokes-b954dcef-3e3e-8015-8007-585acd44c5c9-320b5b95-d08d-8089-8007-585a974337b3"
- class="strokes"
+ stroke-linecap="round"
><g class="stroke-shape"
><path
d="M99.79296875,30.68115234375L49.588134765625,80.8857421875C40.215576171875,90.258056640625,40.215576171875,105.45404052734375,49.588134765625,114.82708740234375L49.588134765625,114.82708740234375C58.9608154296875,124.19903564453125,74.1566162109375,124.19903564453125,83.529296875,114.82708740234375L133.7340087890625,64.62225341796875"
diff --git a/tools/ui/src/lib/components/app/mcp/McpResourcePreview.svelte b/tools/ui/src/lib/components/app/mcp/McpResourcePreview.svelte
index 9a384e397c..eb84b2ab69 100644
--- a/tools/ui/src/lib/components/app/mcp/McpResourcePreview.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpResourcePreview.svelte
@@ -95,18 +95,18 @@
<div class="flex items-center gap-1">
<ActionIconCopyToClipboard
- text={getResourceTextContent(content)}
- canCopy={!isLoading && !!getResourceTextContent(content)}
ariaLabel="Copy content"
+ canCopy={!isLoading && !!getResourceTextContent(content)}
+ text={getResourceTextContent(content)}
/>
<Button
- variant="ghost"
- size="sm"
class="h-7 w-7 p-0"
- onclick={handleDownload}
disabled={isLoading || !getResourceTextContent(content)}
+ onclick={handleDownload}
+ size="sm"
title="Download content"
+ variant="ghost"
>
<Download class="h-3.5 w-3.5" />
</Button>
@@ -135,12 +135,12 @@
{#each blobContent as blob (blob.uri)}
{#if isImageMimeType(blob.mimeType ?? MimeTypeApplication.OCTET_STREAM)}
<img
+ alt="Resource content"
+ class="max-w-full rounded"
src={createBase64DataUrl(
blob.mimeType ?? MimeTypeApplication.OCTET_STREAM,
blob.blob
)}
- alt="Resource content"
- class="max-w-full rounded"
/>
{:else}
<div class="flex items-center gap-2 rounded bg-muted p-2 text-sm text-muted-foreground">
diff --git a/tools/ui/src/lib/components/app/mcp/McpResourceTemplateForm.svelte b/tools/ui/src/lib/components/app/mcp/McpResourceTemplateForm.svelte
index a99cc0e04e..d471ae3381 100644
--- a/tools/ui/src/lib/components/app/mcp/McpResourceTemplateForm.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpResourceTemplateForm.svelte
@@ -138,20 +138,20 @@
}
</script>
-<form onsubmit={handleSubmit} class="space-y-3">
+<form class="space-y-3" onsubmit={handleSubmit}>
{#each variables as variable (variable.name)}
<InputWithSuggestions
- name={variable.name}
- value={values[variable.name] ?? ''}
- suggestions={suggestions[variable.name] ?? []}
- isLoadingSuggestions={loadingSuggestions[variable.name] ?? false}
- isAutocompleteActive={activeAutocomplete === variable.name}
autocompleteIndex={activeAutocomplete === variable.name ? autocompleteIndex : 0}
- onInput={(value) => handleArgInput(variable.name, value)}
- onKeydown={(e) => handleArgKeydown(e, variable.name)}
+ isAutocompleteActive={activeAutocomplete === variable.name}
+ isLoadingSuggestions={loadingSuggestions[variable.name] ?? false}
+ name={variable.name}
onBlur={() => handleArgBlur(variable.name)}
onFocus={() => handleArgFocus(variable.name)}
+ onInput={(value) => handleArgInput(variable.name, value)}
+ onKeydown={(e) => handleArgKeydown(e, variable.name)}
onSelectSuggestion={(value) => selectSuggestion(variable.name, value)}
+ suggestions={suggestions[variable.name] ?? []}
+ value={values[variable.name] ?? ''}
/>
{/each}
@@ -164,8 +164,8 @@
{/if}
<div class="flex justify-end gap-2 pt-1">
- <Button type="button" size="sm" variant="secondary" onclick={onCancel}>Cancel</Button>
+ <Button onclick={onCancel} size="sm" type="button" variant="secondary">Cancel</Button>
- <Button size="sm" type="submit" disabled={!isComplete}>Read Resource</Button>
+ <Button disabled={!isComplete} size="sm" type="submit">Read Resource</Button>
</div>
</form>
diff --git a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte
index c8cf8bbbc2..056603b11a 100644
--- a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte
@@ -137,18 +137,18 @@
{:else}
{#each [...filteredResources.entries()] as [serverName, serverRes] (serverName)}
<McpResourcesBrowserServerItem
- serverName={serverName as string}
- serverRes={serverRes as MCPServerResources}
- isExpanded={expandedServers.has(serverName as string)}
- {selectedUris}
- {selectedTemplateUri}
{expandedFolders}
- onToggleServer={() => toggleServer(serverName as string)}
- onToggleFolder={toggleFolder}
+ isExpanded={expandedServers.has(serverName as string)}
{onSelect}
- {onToggle}
{onTemplateSelect}
+ {onToggle}
+ onToggleFolder={toggleFolder}
+ onToggleServer={() => toggleServer(serverName as string)}
{searchQuery}
+ {selectedTemplateUri}
+ {selectedUris}
+ serverName={serverName as string}
+ serverRes={serverRes as MCPServerResources}
/>
{/each}
{/if}
diff --git a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserHeader.svelte b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserHeader.svelte
index fd7af18748..37f91c226c 100644
--- a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserHeader.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserHeader.svelte
@@ -17,18 +17,18 @@
<div class="flex flex-col gap-2">
<div class="mb-2 flex items-center gap-4">
<SearchInput
+ onInput={(value) => onSearch?.(value)}
placeholder="Search resources..."
value={searchQuery}
- onInput={(value) => onSearch?.(value)}
/>
<Button
- variant="ghost"
- size="sm"
class="h-8 w-8 p-0"
- onclick={onRefresh}
disabled={isLoading}
+ onclick={onRefresh}
+ size="sm"
title="Refresh resources"
+ variant="ghost"
>
{#if isLoading}
<Loader2 class="{ICON_CLASS_DEFAULT} animate-spin" />
diff --git a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserServerItem.svelte b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserServerItem.svelte
index f691202362..434cad4ca3 100644
--- a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserServerItem.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowserServerItem.svelte
@@ -86,7 +86,7 @@
{#if isFolder}
{@const folderCount = countTreeResources(node)}
- <Collapsible.Root open={isFolderExpanded} onOpenChange={() => onToggleFolder(folderId)}>
+ <Collapsible.Root onOpenChange={() => onToggleFolder(folderId)} open={isFolderExpanded}>
<Collapsible.Trigger
class="flex w-full items-center gap-2 rounded px-2 py-1 text-sm hover:bg-muted/50"
>
@@ -121,9 +121,9 @@
{#if onToggle}
<Checkbox
checked={isSelected}
+ class={ICON_CLASS_DEFAULT}
onCheckedChange={(checked: boolean | 'indeterminate') =>
handleCheckboxChange(resource, checked === true)}
- class={ICON_CLASS_DEFAULT}
/>
{/if}
@@ -146,7 +146,7 @@
{/if}
{/snippet}
-<Collapsible.Root open={isExpanded} onOpenChange={onToggleServer}>
+<Collapsible.Root onOpenChange={onToggleServer} open={isExpanded}>
<Collapsible.Trigger
class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-sm hover:bg-muted/50"
>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
index 0ba56caf28..84383d59ea 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
@@ -111,22 +111,22 @@
{#if isEditing}
<McpServerCardEditForm
bind:this={editFormRef}
+ onCancel={cancelEditing}
+ onSave={saveEditing}
serverId={server.id}
+ serverLabel={displayName}
serverUrl={server.url}
serverUseProxy={server.useProxy}
- serverLabel={displayName}
- onSave={saveEditing}
- onCancel={cancelEditing}
/>
{:else}
<McpServerCardHeader
+ {capabilities}
+ disabled={isError}
{displayName}
- {faviconUrl}
enabled={enabled ?? server.enabled}
- disabled={isError}
+ {faviconUrl}
{onToggle}
{serverInfo}
- {capabilities}
{transportType}
/>
@@ -145,11 +145,15 @@
<div class="space-y-2">
<div class="flex items-center gap-2">
<Skeleton class="{ICON_CLASS_DEFAULT} rounded" />
+
<Skeleton class="h-3 w-24" />
</div>
+
<div class="flex flex-wrap gap-1.5">
<Skeleton class="h-5 w-16 rounded-full" />
+
<Skeleton class="h-5 w-20 rounded-full" />
+
<Skeleton class="h-5 w-14 rounded-full" />
</div>
</div>
@@ -157,6 +161,7 @@
<div class="space-y-1.5">
<div class="flex items-center gap-2">
<Skeleton class="{ICON_CLASS_DEFAULT} rounded" />
+
<Skeleton class="h-3 w-32" />
</div>
</div>
@@ -170,7 +175,7 @@
{/if}
{#if connectionLogs.length > 0}
- <McpConnectionLogs logs={connectionLogs} {connectionTimeMs} />
+ <McpConnectionLogs {connectionTimeMs} logs={connectionLogs} />
{/if}
{/if}
</div>
@@ -188,9 +193,9 @@
<McpServerCardActions
{isHealthChecking}
+ onDelete={handleDeleteClick}
onEdit={startEditing}
onRefresh={handleHealthCheck}
- onDelete={handleDeleteClick}
/>
</div>
{/if}
@@ -199,6 +204,6 @@
<McpServerCardDeleteDialog
bind:open={showDeleteDialog}
{displayName}
- onOpenChange={(open) => (showDeleteDialog = open)}
onConfirm={onDelete}
+ onOpenChange={(open) => (showDeleteDialog = open)}
/>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardActions.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardActions.svelte
index fbfc8beda1..a327a02e48 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardActions.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardActions.svelte
@@ -13,27 +13,27 @@
</script>
<div class="flex shrink-0 items-center gap-1">
- <Button variant="ghost" size="icon" class="h-7 w-7" onclick={onEdit} aria-label="Edit">
+ <Button aria-label="Edit" class="h-7 w-7" onclick={onEdit} size="icon" variant="ghost">
<Pencil class="h-3.5 w-3.5" />
</Button>
<Button
- variant="ghost"
- size="icon"
+ aria-label="Refresh"
class="h-7 w-7"
- onclick={onRefresh}
disabled={isHealthChecking}
- aria-label="Refresh"
+ onclick={onRefresh}
+ size="icon"
+ variant="ghost"
>
<RefreshCw class="h-3.5 w-3.5" />
</Button>
<Button
- variant="ghost"
- size="icon"
+ aria-label="Delete"
class="hover:text-destructive-foreground h-7 w-7 text-destructive hover:bg-destructive/10"
onclick={onDelete}
- aria-label="Delete"
+ size="icon"
+ variant="ghost"
>
<Trash2 class="h-3.5 w-3.5" />
</Button>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardCompact.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardCompact.svelte
index 5157c5779b..da0ce1ffe7 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardCompact.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardCompact.svelte
@@ -30,11 +30,11 @@
<div class="flex min-w-0 items-center gap-2">
{#if activeIconUrl}
<img
- src={activeIconUrl}
alt=""
class="h-5 w-5 shrink-0 rounded"
- loading="lazy"
decoding="async"
+ loading="lazy"
+ src={activeIconUrl}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardEditForm.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardEditForm.svelte
index 8705d36517..88cd5e02d1 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardEditForm.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardEditForm.svelte
@@ -67,27 +67,27 @@
}
</script>
-<form onsubmit={handleSubmit} class="contents">
+<form class="contents" onsubmit={handleSubmit}>
<div class="space-y-4">
<p class="font-medium">Configure Server</p>
<McpServerForm
- url={editUrl}
+ headers={editHeaders}
+ id={serverId}
name={editName}
+ onHeadersChange={(v) => (editHeaders = v)}
onNameChange={(v) => (editName = v)}
- headers={editHeaders}
- useProxy={editUseProxy}
onUrlChange={(v) => (editUrl = v)}
- onHeadersChange={(v) => (editHeaders = v)}
onUseProxyChange={(v) => (editUseProxy = v)}
+ url={editUrl}
urlError={editUrl ? urlError : null}
- id={serverId}
+ useProxy={editUseProxy}
/>
<div class="flex items-center justify-end gap-2">
- <Button variant="secondary" size="sm" onclick={onCancel}>Cancel</Button>
+ <Button onclick={onCancel} size="sm" variant="secondary">Cancel</Button>
- <Button size="sm" type="submit" disabled={!canSave}>
+ <Button disabled={!canSave} size="sm" type="submit">
{serverUrl.trim() ? 'Update' : 'Add'}
</Button>
</div>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
index 4e27243f5c..30369d6509 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
@@ -36,10 +36,10 @@
<McpServerIdentity
{displayName}
{faviconUrl}
- {serverInfo}
iconClass="h-5 w-5"
iconRounded="rounded"
nameClass="leading-6 font-medium"
+ {serverInfo}
/>
</div>
@@ -47,7 +47,7 @@
<div class="flex flex-wrap items-center gap-1.5">
{#if transportType}
{@const TransportIcon = MCP_TRANSPORT_ICONS[transportType]}
- <Badge variant="outline" class="h-5 gap-1 px-1.5 text-[10px]">
+ <Badge class="h-5 gap-1 px-1.5 text-[10px]" variant="outline">
{#if TransportIcon}
<TransportIcon class="h-3 w-3" />
{/if}
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerCardSkeleton.svelte b/tools/ui/src/lib/components/app/mcp/McpServerCardSkeleton.svelte
index 39a1372806..52776ff606 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerCardSkeleton.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerCardSkeleton.svelte
@@ -7,20 +7,26 @@
<div class="flex items-center justify-between gap-4">
<div class="flex items-center gap-2">
<Skeleton class="h-5 w-5 rounded" />
+
<Skeleton class="h-5 w-28" />
+
<Skeleton class="h-5 w-12 rounded-full" />
</div>
+
<Skeleton class="h-6 w-11 rounded-full" />
</div>
<div class="flex flex-wrap gap-1.5">
<Skeleton class="h-5 w-14 rounded-full" />
+
<Skeleton class="h-5 w-12 rounded-full" />
+
<Skeleton class="h-5 w-16 rounded-full" />
</div>
<div class="space-y-1.5">
<Skeleton class="h-4 w-40" />
+
<Skeleton class="h-4 w-52" />
</div>
@@ -28,7 +34,9 @@
<div class="flex justify-end gap-2">
<Skeleton class="h-8 w-8 rounded" />
+
<Skeleton class="h-8 w-8 rounded" />
+
<Skeleton class="h-8 w-8 rounded" />
</div>
</Card.Root>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerForm.svelte b/tools/ui/src/lib/components/app/mcp/McpServerForm.svelte
index f3c1551cae..f9f07ad63d 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerForm.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerForm.svelte
@@ -140,18 +140,18 @@
<div class="grid gap-2">
<div class="mb-4">
- <label for="server-url-{id}" class="mb-2 block text-xs font-medium select-none">
+ <label class="mb-2 block text-xs font-medium select-none" for="server-url-{id}">
Server URL <span class="text-destructive">*</span>
</label>
<Input
+ bind:ref={urlInput}
+ class={urlError ? 'border-destructive' : ''}
id="server-url-{id}"
- type="url"
+ oninput={(e) => onUrlChange(e.currentTarget.value)}
placeholder={MCP_SERVER_URL_PLACEHOLDER}
+ type="url"
value={url}
- oninput={(e) => onUrlChange(e.currentTarget.value)}
- class={urlError ? 'border-destructive' : ''}
- bind:ref={urlInput}
/>
{#if urlError}
@@ -160,25 +160,25 @@
</div>
<div class="mb-4">
- <label for="server-name-{id}" class="mb-2 block text-xs font-medium select-none">
+ <label class="mb-2 block text-xs font-medium select-none" for="server-name-{id}">
Display name
</label>
<Input
id="server-name-{id}"
- type="text"
+ oninput={(e) => onNameChange?.(e.currentTarget.value)}
placeholder={namePlaceholder}
+ type="text"
value={name}
- oninput={(e) => onNameChange?.(e.currentTarget.value)}
/>
</div>
<label class="flex items-center gap-2 cursor-pointer select-none">
<Switch
- id="use-authorization-{id}"
checked={showAuthorization}
- onCheckedChange={setUseAuthorization}
disabled={required}
+ id="use-authorization-{id}"
+ onCheckedChange={setUseAuthorization}
/>
<span class="text-xs text-muted-foreground">
@@ -190,14 +190,14 @@
{#if showAuthorization}
<div class="relative mt-2">
<Input
- id="bearer-token-{id}"
- type="password"
+ bind:ref={bearerInput}
autocomplete="off"
+ class="pl-16"
+ id="bearer-token-{id}"
+ oninput={(e) => updateBearerToken(e.currentTarget.value)}
placeholder="Paste token here"
+ type="password"
value={bearerToken}
- oninput={(e) => updateBearerToken(e.currentTarget.value)}
- class="pl-16"
- bind:ref={bearerInput}
/>
<span
@@ -209,19 +209,19 @@
{/if}
<KeyValuePairs
+ addButtonLabel="Add"
class="mt-3"
- pairs={headerPairs.filter((p) => !ownedByBearerUi(p))}
+ emptyMessage="No custom headers configured."
+ keyPlaceholder="Header name"
onPairsChange={(pairs) => {
const auth = headerPairs.find(ownedByBearerUi);
updateHeaderPairs(auth ? [...pairs, auth] : pairs);
}}
- keyPlaceholder="Header name"
- valuePlaceholder="Value"
- addButtonLabel="Add"
- emptyMessage="No custom headers configured."
+ pairs={headerPairs.filter((p) => !ownedByBearerUi(p))}
sectionLabel="Custom Headers"
sectionLabelOptional
+ valuePlaceholder="Value"
/>
{#if !isWebSocket && onUseProxyChange}
@@ -233,10 +233,10 @@
]}
>
<Switch
- class="mt-1"
- id="use-proxy-{id}"
checked={useProxy}
+ class="mt-1"
disabled={!mcpStore.isProxyAvailable}
+ id="use-proxy-{id}"
onCheckedChange={(checked) => onUseProxyChange?.(checked)}
/>
diff --git a/tools/ui/src/lib/components/app/mcp/McpServerIdentity.svelte b/tools/ui/src/lib/components/app/mcp/McpServerIdentity.svelte
index c87ab92030..23f72b7ea5 100644
--- a/tools/ui/src/lib/components/app/mcp/McpServerIdentity.svelte
+++ b/tools/ui/src/lib/components/app/mcp/McpServerIdentity.svelte
@@ -35,27 +35,27 @@
<span class="flex min-w-0 items-center gap-1.5">
{#if faviconUrl}
- <img src={faviconUrl} alt="" class={['shrink-0 text-foreground', iconRounded, iconClass]} />
+ <img alt="" class={['shrink-0 text-foreground', iconRounded, iconClass]} src={faviconUrl} />
{:else}
<McpLogo class={['shrink-0 text-foreground', iconRounded, iconClass].join(' ')} />
{/if}
- <TruncatedText text={displayName ?? ''} class={nameClass ?? ''} />
+ <TruncatedText class={nameClass ?? ''} text={displayName ?? ''} />
{#if showVersion && serverInfo?.version}
- <Badge variant="secondary" class="h-4 max-w-24 min-w-0 shrink px-1 text-[10px]">
+ <Badge class="h-4 max-w-24 min-w-0 shrink px-1 text-[10px]" variant="secondary">
<TruncatedText text={`v${serverInfo.version}`} />
</Badge>
{/if}
{#if showWebsite && safeWebsiteUrl}
<a
- href={safeWebsiteUrl}
- target="_blank"
- rel="noopener noreferrer"
- class="shrink-0 text-muted-foreground hover:text-foreground"
aria-label="Open website"
+ class="shrink-0 text-muted-foreground hover:text-foreground"
+ href={safeWebsiteUrl}
onclick={(e) => e.stopPropagation()}
+ rel="noopener noreferrer"
+ target="_blank"
>
<ExternalLink class="h-3 w-3" />
</a>
diff --git a/tools/ui/src/lib/components/app/misc/CodeBlockActions.svelte b/tools/ui/src/lib/components/app/misc/CodeBlockActions.svelte
index cd421f022b..f1865b886c 100644
--- a/tools/ui/src/lib/components/app/misc/CodeBlockActions.svelte
+++ b/tools/ui/src/lib/components/app/misc/CodeBlockActions.svelte
@@ -17,17 +17,17 @@
<div class="code-block-actions">
<ActionIconCopyToClipboard
- text={code}
- canCopy={!disabled}
ariaLabel={disabled ? 'Code incomplete' : 'Copy code'}
+ canCopy={!disabled}
+ text={code}
/>
{#if showPreview}
<ActionIcon
- icon={Eye}
- tooltip={disabled ? 'Code incomplete' : 'Preview code'}
{disabled}
+ icon={Eye}
onclick={() => onPreview!(code, language)}
+ tooltip={disabled ? 'Code incomplete' : 'Preview code'}
/>
{/if}
</div>
diff --git a/tools/ui/src/lib/components/app/misc/ConversationSelection.svelte b/tools/ui/src/lib/components/app/misc/ConversationSelection.svelte
index 66f6b2cb89..e8f173c097 100644
--- a/tools/ui/src/lib/components/app/misc/ConversationSelection.svelte
+++ b/tools/ui/src/lib/components/app/misc/ConversationSelection.svelte
@@ -124,7 +124,7 @@
<tbody>
{#if filteredConversations.length === 0}
<tr>
- <td colspan="3" class="p-8 text-center text-sm text-muted-foreground">
+ <td class="p-8 text-center text-sm text-muted-foreground" colspan="3">
{#if searchQuery}
No conversations found matching "{searchQuery}"
{:else}
@@ -140,8 +140,8 @@
? 'bg-muted/75'
: ''}"
{...{ [UI_DATA_ATTRS.CONVERSATION_ROW]: conv.id }}
- onmousedown={(event) => marquee.rowMouseDown(conv.id, event)}
onclick={(event) => marquee.rowClick(conv.id, event.shiftKey)}
+ onmousedown={(event) => marquee.rowMouseDown(conv.id, event)}
>
<td class="p-3">
<Checkbox
@@ -172,9 +172,9 @@
</div>
<div class="flex justify-end gap-2">
- <Button variant="outline" onclick={handleCancel}>Cancel</Button>
+ <Button onclick={handleCancel} variant="outline">Cancel</Button>
- <Button onclick={handleConfirm} disabled={selectedIds.size === 0}>
+ <Button disabled={selectedIds.size === 0} onclick={handleConfirm}>
{mode === 'export' ? 'Export' : 'Import'} ({selectedIds.size})
</Button>
</div>
diff --git a/tools/ui/src/lib/components/app/misc/ScrollCarousel.svelte b/tools/ui/src/lib/components/app/misc/ScrollCarousel.svelte
index a0a914f5ec..38f4d07b84 100644
--- a/tools/ui/src/lib/components/app/misc/ScrollCarousel.svelte
+++ b/tools/ui/src/lib/components/app/misc/ScrollCarousel.svelte
@@ -90,20 +90,20 @@
: 'pointer-events-none opacity-0')
)}
{...isCenter ? { disabled: !carousel.canScrollLeft } : {}}
- onclick={scrollLeft}
aria-label="Scroll left"
+ onclick={scrollLeft}
>
<ChevronLeft class={ICON_CLASS_DEFAULT} />
</button>
<div
- class={cn('scrollbar-hide overflow-x-auto', containerClass)}
bind:this={carousel.scrollContainer}
+ class={cn('scrollbar-hide overflow-x-auto', containerClass)}
onscroll={carousel.updateScrollButtons}
>
<div
- class={cn('flex min-w-max', isCenter && 'items-start', `gap-${gapSize}`, innerClass)}
bind:this={carousel.contentContainer}
+ class={cn('flex min-w-max', isCenter && 'items-start', `gap-${gapSize}`, innerClass)}
>
{@render children?.()}
</div>
@@ -123,8 +123,8 @@
: 'pointer-events-none opacity-0')
)}
{...isCenter ? { disabled: !carousel.canScrollRight } : {}}
- onclick={scrollRight}
aria-label="Scroll right"
+ onclick={scrollRight}
>
<ChevronRight class={ICON_CLASS_DEFAULT} />
</button>
diff --git a/tools/ui/src/lib/components/app/models/ModelBadge.svelte b/tools/ui/src/lib/components/app/models/ModelBadge.svelte
index 58d2160ec6..d5b723ff90 100644
--- a/tools/ui/src/lib/components/app/models/ModelBadge.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelBadge.svelte
@@ -37,7 +37,7 @@
{/if}
{#if showCopyIcon}
- <ActionIconCopyToClipboard text={model || ''} ariaLabel="Copy model name" />
+ <ActionIconCopyToClipboard ariaLabel="Copy model name" text={model || ''} />
{/if}
</BadgeInfo>
{/snippet}
diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte
index 1cd56c1246..1e1798e2fa 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte
@@ -205,10 +205,10 @@
{#if selectedOption}
<ModelId
- modelId={selectedOption.model}
class="min-w-0 overflow-hidden"
hideOrgName={false}
hideQuantization
+ modelId={selectedOption.model}
/>
{:else}
<span class="min-w-0 font-medium">Select model</span>
@@ -240,25 +240,25 @@
onOpenAutoFocus={(event) => event.preventDefault()}
>
<DropdownMenuSearchable
- searchValue={ms.searchTerm}
- onSearchChange={(v) => ms.setSearchTerm(v)}
- placeholder="Search models..."
- onSearchKeyDown={handleSearchKeyDown}
emptyMessage="No models found."
isEmpty={ms.filteredOptions.length === 0 && ms.isCurrentModelInCache}
+ onSearchChange={(v) => ms.setSearchTerm(v)}
+ onSearchKeyDown={handleSearchKeyDown}
+ placeholder="Search models..."
+ searchValue={ms.searchTerm}
>
<div class="models-list">
{#if !ms.isCurrentModelInCache && currentModel}
<!-- Show unavailable model as first option (disabled) -->
<button
- type="button"
- class="flex w-full cursor-not-allowed items-center bg-red-400/10 p-2 text-left text-sm text-red-400"
- role="option"
- aria-selected="true"
aria-disabled="true"
+ aria-selected="true"
+ class="flex w-full cursor-not-allowed items-center bg-red-400/10 p-2 text-left text-sm text-red-400"
disabled
+ role="option"
+ type="button"
>
- <ModelId modelId={currentModel} class="flex-1" hideQuantization />
+ <ModelId class="flex-1" hideQuantization modelId={currentModel} />
<span class="ml-2 text-xs whitespace-nowrap opacity-70">(not available)</span>
</button>
@@ -275,31 +275,31 @@
{@const isFav = ms.isFavorite(option.model)}
<ModelsSelectorOption
- {option}
- {isSelected}
- {isHighlighted}
- {isFav}
{hideOrgName}
- onSelect={ms.handleSelect}
+ {isFav}
+ {isHighlighted}
+ {isSelected}
onInfoClick={ms.handleInfoClick}
- onMouseEnter={() => (highlightedId = option.id)}
onKeyDown={(event) => {
if (event.key === KeyboardKey.ENTER || event.key === KeyboardKey.SPACE) {
event.preventDefault();
void handleModelKeyAction(option.id, event.altKey);
}
}}
+ onMouseEnter={() => (highlightedId = option.id)}
+ onSelect={ms.handleSelect}
+ {option}
/>
{/snippet}
<ModelsSelectorList
- groups={ms.groupedFilteredOptions}
- {currentModel}
activeId={ms.activeId}
- sectionHeaderClass="my-1.5 px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none"
- onSelect={ms.handleSelect}
+ {currentModel}
+ groups={ms.groupedFilteredOptions}
onInfoClick={ms.handleInfoClick}
+ onSelect={ms.handleSelect}
renderOption={modelOption}
+ sectionHeaderClass="my-1.5 px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none"
/>
</div>
</DropdownMenuSearchable>
@@ -323,18 +323,18 @@
: 'text-foreground',
isOpen && 'text-foreground'
]}
- style="max-width: min(calc(100cqw - 6.5rem), 32rem)"
- onclick={() => ms.handleOpenChange(true)}
disabled={disabled || ms.updating}
+ onclick={() => ms.handleOpenChange(true)}
+ style="max-width: min(calc(100cqw - 6.5rem), 32rem)"
>
<MODEL_SELECTOR_ICON class="h-3.5 w-3.5 shrink-0" />
{#if selectedOption}
<ModelId
- modelId={selectedOption.model}
class="min-w-0 overflow-hidden"
hideOrgName={false}
hideQuantization
+ modelId={selectedOption.model}
/>
{/if}
@@ -357,8 +357,8 @@
{#if ms.showModelDialog}
<DialogModelInformation
- open={ms.showModelDialog}
- onOpenChange={(v) => ms.setShowModelDialog(v)}
modelId={ms.infoModelId}
+ onOpenChange={(v) => ms.setShowModelDialog(v)}
+ open={ms.showModelDialog}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorList.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorList.svelte
index 38f4db8a72..e40e33d0c0 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelectorList.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorList.svelte
@@ -33,20 +33,21 @@
{@const isFav = modelsStore.favoriteModelIds.has(option.model)}
<ModelsSelectorOption
- {option}
- {isSelected}
- isHighlighted={false}
- {isFav}
{hideOrgName}
- {onSelect}
+ {isFav}
+ isHighlighted={false}
+ {isSelected}
{onInfoClick}
- onMouseEnter={() => {}}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ {onSelect}
+ {option}
/>
{/snippet}
{#if groups.loaded.length > 0}
<p class={sectionHeaderClass}>Loaded models</p>
+
{#each groups.loaded as item (`loaded-${item.option.id}`)}
{@render render(item, false)}
{/each}
@@ -54,6 +55,7 @@
{#if groups.favorites.length > 0}
<p class={sectionHeaderClass}>Favorite models</p>
+
{#each groups.favorites as item (`fav-${item.option.id}`)}
{@render render(item, true)}
{/each}
@@ -61,10 +63,12 @@
{#if groups.available.length > 0}
<p class={sectionHeaderClass}>Available models</p>
+
{#each groups.available as group (group.orgName)}
{#if group.orgName}
<p class={orgHeaderClass}>{group.orgName}</p>
{/if}
+
{#each group.items as item (item.option.id)}
{@render render(item, true)}
{/each}
diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte
index acdb36bcad..77e626c3e1 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte
@@ -61,6 +61,7 @@
</script>
<div
+ aria-selected={isSelected || isHighlighted}
class={[
'group relative flex w-full items-center gap-2 rounded-sm p-2 text-left text-sm transition focus:outline-none',
'cursor-pointer',
@@ -69,20 +70,19 @@
!isSelected && !isHighlighted && 'hover:bg-muted',
isLoaded ? 'text-popover-foreground' : 'text-muted-foreground'
]}
- role="option"
- aria-selected={isSelected || isHighlighted}
- title={loadTitle}
- tabindex="0"
onclick={() => onSelect(option.id)}
- onmouseenter={onMouseEnter}
onkeydown={onKeyDown}
+ onmouseenter={onMouseEnter}
+ role="option"
+ tabindex="0"
+ title={loadTitle}
>
<ModelId
- modelId={option.model}
- {hideOrgName}
aliases={option.aliases}
- tags={option.tags}
class="flex-1"
+ {hideOrgName}
+ modelId={option.model}
+ tags={option.tags}
/>
<div class="flex shrink-0 items-center gap-1">
@@ -94,30 +94,30 @@
>
{#if isFav}
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={HeartOff}
- tooltip="Remove from favorites"
class="h-3 w-3 hover:text-foreground"
+ icon={HeartOff}
+ iconSize="h-2.5 w-2.5"
onclick={() => modelsStore.toggleFavorite(option.model)}
+ tooltip="Remove from favorites"
/>
{:else}
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={Heart}
- tooltip="Add to favorites"
class="h-3 w-3 hover:text-foreground"
+ icon={Heart}
+ iconSize="h-2.5 w-2.5"
onclick={() => modelsStore.toggleFavorite(option.model)}
+ tooltip="Add to favorites"
/>
{/if}
<!-- info button: only shown when model is loaded and callback is provided -->
{#if isLoaded && onInfoClick}
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={Info}
- tooltip="Model information"
class="h-3 w-3 hover:text-foreground"
+ icon={Info}
+ iconSize="h-2.5 w-2.5"
onclick={() => onInfoClick(option.model)}
+ tooltip="Model information"
/>
{/if}
</div>
@@ -134,12 +134,12 @@
<div class="hidden group-hover:flex [@media(pointer:coarse)]:flex">
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={RotateCw}
- tooltip="Retry loading model"
class="h-3 w-3 text-red-500 hover:text-foreground"
+ icon={RotateCw}
+ iconSize="h-2.5 w-2.5"
onclick={() => modelsStore.status.load(option.model)}
stopPropagationOnClick
+ tooltip="Retry loading model"
/>
</div>
</div>
@@ -151,14 +151,14 @@
<div class="hidden group-hover:flex [@media(pointer:coarse)]:flex">
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={PowerOff}
- tooltip="Unload model"
class="h-3 w-3 text-red-500 hover:text-red-600 [@media(pointer:coarse)]:text-amber-500 [@media(pointer:coarse)]:hover:text-amber-600"
+ icon={PowerOff}
+ iconSize="h-2.5 w-2.5"
onclick={(e) => {
e?.stopPropagation();
modelsStore.status.unload(option.model);
}}
+ tooltip="Unload model"
/>
</div>
</div>
@@ -170,12 +170,12 @@
<div class="hidden group-hover:flex [@media(pointer:coarse)]:flex">
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={PowerOff}
- tooltip="Unload model"
class="h-3 w-3 text-red-500 hover:text-red-600 [@media(pointer:coarse)]:text-green-500 [@media(pointer:coarse)]:hover:text-green-600"
+ icon={PowerOff}
+ iconSize="h-2.5 w-2.5"
onclick={() => modelsStore.status.unload(option.model)}
stopPropagationOnClick
+ tooltip="Unload model"
/>
</div>
</div>
@@ -187,12 +187,12 @@
<div class="hidden group-hover:flex [@media(pointer:coarse)]:flex">
<ActionIcon
- iconSize="h-2.5 w-2.5"
- icon={Power}
- tooltip="Load model"
class="h-3 w-3 [@media(pointer:coarse)]:text-muted-foreground"
+ icon={Power}
+ iconSize="h-2.5 w-2.5"
onclick={() => modelsStore.status.load(option.model)}
stopPropagationOnClick
+ tooltip="Load model"
/>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte
index 0d10dd106c..c89ca186e3 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte
@@ -79,7 +79,6 @@
{#if ms.isRouter}
<button
- type="button"
class={[
`relative inline-flex cursor-pointer items-center gap-1.5 rounded-sm bg-background px-1.5 py-1 text-xs shadow-sm transition hover:bg-muted-foreground/20 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60 max-sm:px-3 max-sm:py-2 max-sm:text-sm dark:bg-muted-foreground/15 dark:text-secondary-foreground`,
!ms.isCurrentModelInCache
@@ -91,9 +90,10 @@
: 'text-foreground',
sheetOpen && 'text-foreground'
]}
- style="max-width: min(calc(100cqw - 9rem), 20rem)"
disabled={disabled || ms.updating}
onclick={() => ms.handleOpenChange(true)}
+ style="max-width: min(calc(100cqw - 9rem), 20rem)"
+ type="button"
>
<Package class="h-3.5 w-3.5 shrink-0" />
@@ -102,10 +102,10 @@
{:else}
<ModelId
class="text-xs"
- modelId={selectedOption?.model || ''}
+ hideOrgName
hideQuantization
hideTags
- hideOrgName
+ modelId={selectedOption?.model || ''}
/>
{/if}
@@ -121,7 +121,7 @@
</button>
<Sheet.Root bind:open={sheetOpen} onOpenChange={handleSheetOpenChange}>
- <Sheet.Content side="bottom" class="max-h-[85vh] gap-1">
+ <Sheet.Content class="max-h-[85vh] gap-1" side="bottom">
<Sheet.Header>
<Sheet.Title>Select Model</Sheet.Title>
@@ -133,24 +133,26 @@
<div class="flex flex-col gap-1 pb-4">
<div class="mb-3 px-4">
<SearchInput
+ onInput={(v) => ms.setSearchTerm(v)}
placeholder="Search models..."
value={ms.searchTerm}
- onInput={(v) => ms.setSearchTerm(v)}
/>
</div>
<div class="max-h-[60vh] overflow-y-auto px-2">
{#if !ms.isCurrentModelInCache && currentModel}
<button
- type="button"
class="flex w-full cursor-not-allowed items-center rounded-md bg-red-400/10 px-3 py-2.5 text-left text-sm text-red-400"
disabled
+ type="button"
>
<span class="min-w-0 flex-1 truncate">
{selectedOption?.name || currentModel}
</span>
+
<span class="ml-2 text-xs whitespace-nowrap opacity-70">(not available)</span>
</button>
+
<div class="my-1 h-px bg-border"></div>
{/if}
@@ -159,13 +161,13 @@
{/if}
<ModelsSelectorList
- groups={ms.groupedFilteredOptions}
- {currentModel}
activeId={ms.activeId}
- sectionHeaderClass="px-2 py-2 text-xs font-semibold text-muted-foreground/60 select-none"
- orgHeaderClass="px-2 py-2 text-xs font-semibold text-muted-foreground/60 select-none [&:not(:first-child)]:mt-2"
- onSelect={ms.handleSelect}
+ {currentModel}
+ groups={ms.groupedFilteredOptions}
onInfoClick={ms.handleInfoClick}
+ onSelect={ms.handleSelect}
+ orgHeaderClass="px-2 py-2 text-xs font-semibold text-muted-foreground/60 select-none [&:not(:first-child)]:mt-2"
+ sectionHeaderClass="px-2 py-2 text-xs font-semibold text-muted-foreground/60 select-none"
/>
</div>
</div>
@@ -183,13 +185,13 @@
? 'text-foreground'
: 'text-foreground'
]}
- style="max-width: min(calc(100cqw - 6.5rem), 32rem)"
- onclick={() => ms.handleOpenChange(true)}
disabled={disabled || ms.updating}
+ onclick={() => ms.handleOpenChange(true)}
+ style="max-width: min(calc(100cqw - 6.5rem), 32rem)"
>
<Package class="h-3.5 w-3.5 shrink-0" />
- <ModelId modelId={selectedOption?.model || ''} class="font-medium" hideQuantization />
+ <ModelId class="font-medium" hideQuantization modelId={selectedOption?.model || ''} />
{#if ms.updating}
<Loader2 class="h-3 w-3.5 shrink-0 animate-spin" />
@@ -201,8 +203,8 @@
{#if ms.showModelDialog}
<DialogModelInformation
- open={ms.showModelDialog}
- onOpenChange={(v) => ms.setShowModelDialog(v)}
modelId={ms.infoModelId}
+ onOpenChange={(v) => ms.setShowModelDialog(v)}
+ open={ms.showModelDialog}
/>
{/if}
diff --git a/tools/ui/src/lib/components/app/navigation/DropdownMenuActions.svelte b/tools/ui/src/lib/components/app/navigation/DropdownMenuActions.svelte
index 1bf41b69a7..20df04eb42 100644
--- a/tools/ui/src/lib/components/app/navigation/DropdownMenuActions.svelte
+++ b/tools/ui/src/lib/components/app/navigation/DropdownMenuActions.svelte
@@ -44,12 +44,14 @@
onclick={(e) => e.stopPropagation()}
>
{@render iconComponent(triggerIcon, 'h-3 w-3')}
+
{#if triggerTooltip}
<span class="sr-only">{triggerTooltip}</span>
{/if}
</DropdownMenu.Trigger>
{/snippet}
</Tooltip.Trigger>
+
{#if triggerTooltip}
<Tooltip.Content>
<p>{triggerTooltip}</p>
@@ -64,10 +66,10 @@
{/if}
<DropdownMenu.Item
+ class="flex items-center justify-between hover:[&>kbd]:opacity-100"
+ disabled={action.disabled}
onclick={action.onclick}
variant={action.variant}
- disabled={action.disabled}
- class="flex items-center justify-between hover:[&>kbd]:opacity-100"
>
<div class="flex items-center gap-2">
{@render iconComponent(
diff --git a/tools/ui/src/lib/components/app/navigation/DropdownMenuSearchable.svelte b/tools/ui/src/lib/components/app/navigation/DropdownMenuSearchable.svelte
index 0e036c9a7a..f14db5f23c 100644
--- a/tools/ui/src/lib/components/app/navigation/DropdownMenuSearchable.svelte
+++ b/tools/ui/src/lib/components/app/navigation/DropdownMenuSearchable.svelte
@@ -28,10 +28,10 @@
<div class="sticky top-0 z-10 mb-2 bg-popover p-1 pt-2">
<SearchInput
- {placeholder}
bind:value={searchValue}
onInput={onSearchChange}
onKeyDown={onSearchKeyDown}
+ {placeholder}
/>
</div>
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigation.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigation.svelte
index 424f2feca9..dfe55b5e29 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigation.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigation.svelte
@@ -306,7 +306,7 @@
}
</script>
-<svelte:window onkeydown={handleKeydown} bind:innerWidth />
+<svelte:window bind:innerWidth onkeydown={handleKeydown} />
{#if innerWidth > 768 || (!page.url.hash.includes(ROUTES.SETTINGS) && !page.url.hash.includes(ROUTES.MCP_SERVERS) && !page.url.hash.includes(ROUTES.SEARCH))}
<aside
@@ -329,109 +329,109 @@
>
<div class="px-2 flex items-center justify-between">
<div
- role="button"
- tabindex="0"
class="relative"
onmouseenter={() => (logoHovered = true)}
onmouseleave={() => (logoHovered = false)}
+ role="button"
+ tabindex="0"
>
<ActionIcon
- icon={!uiStore.isSidebarExpanded && logoHovered && innerWidth > 768
- ? PanelLeftOpen
- : Logo}
- size="lg"
- iconSize="h-4.5 w-4.5 md:h-4 md:w-4"
+ ariaLabel={uiStore.isSidebarExpanded ? 'Go to start' : 'Expand navigation'}
class="{uiStore.isSidebarExpanded
? 'bg-muted! md:bg-foreground/5!'
: 'bg-transparent!'} md:h-9 md:w-9 h-10 w-10 rounded-full md:hover:bg-foreground/10! pointer-events-auto"
href={uiStore.isSidebarExpanded ? ROUTES.START : undefined}
+ icon={!uiStore.isSidebarExpanded && logoHovered && innerWidth > 768
+ ? PanelLeftOpen
+ : Logo}
+ iconSize="h-4.5 w-4.5 md:h-4 md:w-4"
onclick={uiStore.isSidebarExpanded ? undefined : toggleExpandedMode}
+ size="lg"
tooltip={uiStore.isSidebarExpanded ? undefined : 'Open Sidebar'}
tooltipSide={TooltipSide.RIGHT}
- ariaLabel={uiStore.isSidebarExpanded ? 'Go to start' : 'Expand navigation'}
/>
</div>
{#if isOnMobile || (uiStore.isSidebarExpanded && !alwaysShowOnDesktop)}
<div
+ in:fade={{ delay: 50, duration: 150, easing: circIn }}
+ out:fade={{ duration: 100 }}
class="flex items-center transition-all duration-150 ease-out {deviceStore.isMobile &&
!uiStore.isSidebarExpanded
? 'opacity-0 h-0!'
: ''}"
- in:fade={{ delay: 50, duration: 150, easing: circIn }}
- out:fade={{ duration: 100 }}
>
<ActionIcon
+ ariaLabel="Collapse navigation"
+ class="backdrop-blur-none md:h-9 md:w-9 h-10 w-10 rounded-full mr-1 hover:bg-accent!"
icon={deviceStore.isMobile ? X : PanelLeftClose}
- size="lg"
iconSize="h-4.5 w-4.5 md:h-4 md:w-4"
- class="backdrop-blur-none md:h-9 md:w-9 h-10 w-10 rounded-full mr-1 hover:bg-accent!"
onclick={toggleExpandedMode}
+ size="lg"
tooltip="Close Sidebar"
tooltipSide={TooltipSide.LEFT}
- ariaLabel="Collapse navigation"
/>
</div>
{/if}
</div>
<div
+ in:fade={{ duration: 200 }}
+ out:fade={{ duration: 200 }}
class="mt-2 flex min-h-0 flex-1 flex-col gap-4 md:gap-1 {deviceStore.isMobile
? 'transition-[opacity,height] duration-200 ease-out'
: ''} {deviceStore.isMobile && !uiStore.isSidebarExpanded ? 'opacity-0 !h-0' : ''}"
- in:fade={{ duration: 200 }}
- out:fade={{ duration: 200 }}
>
<SidebarNavigationActions
- isExpandedMode={innerWidth > 768 ? uiStore.isSidebarExpanded : true}
- class="px-2"
bind:isSearchModeActive
bind:searchQuery
- onSearchDeactivated={() => {
- isSearchModeActive = false;
- searchQuery = '';
+ class="px-2"
+ isExpandedMode={innerWidth > 768 ? uiStore.isSidebarExpanded : true}
+ onNewChat={() => {
+ if (deviceStore.isMobile) {
+ scheduleMobileCollapse();
+ }
}}
onSearchClick={() => {
uiStore.isSidebarExpanded = true;
isSearchModeActive = true;
}}
- onNewChat={() => {
- if (deviceStore.isMobile) {
- scheduleMobileCollapse();
- }
+ onSearchDeactivated={() => {
+ isSearchModeActive = false;
+ searchQuery = '';
}}
/>
{#if uiStore.isSidebarExpanded || isOnMobile}
<div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
<SidebarNavigationConversationList
+ {allSelectedArePinned}
+ allVisibleSelected={visibleSelectionStats.visibleCount > 0 &&
+ visibleSelectionStats.selectedVisibleCount === visibleSelectionStats.visibleCount}
class="px-2"
- {filteredConversations}
{currentChatId}
+ {filteredConversations}
{isSearchModeActive}
- {searchQuery}
{isSelectionMode}
- {selectedIds}
- onSelect={selectConversation}
- onEdit={handleEditConversation}
+ onBulkDelete={handleBulkDelete}
+ onBulkExport={handleBulkExport}
+ onBulkPinToggle={handleBulkPinToggle}
+ onCloseSelection={exitSelectionMode}
onDelete={handleDeleteConversation}
- onStop={handleStopGeneration}
- onToggleSelect={toggleSelected}
+ onEdit={handleEditConversation}
onEnterSelectionMode={enterSelectionMode}
- onSelectionClick={handleSelectionClick}
onRowMouseDown={handleRowMouseDown}
- visibleCount={visibleSelectionStats.visibleCount}
- allVisibleSelected={visibleSelectionStats.visibleCount > 0 &&
- visibleSelectionStats.selectedVisibleCount === visibleSelectionStats.visibleCount}
+ onSelect={selectConversation}
+ onSelectAllToggle={toggleSelectAllVisible}
+ onSelectionClick={handleSelectionClick}
+ onStop={handleStopGeneration}
+ onToggleSelect={toggleSelected}
+ {pinStateIsMixed}
+ {searchQuery}
+ {selectedIds}
someVisibleSelected={visibleSelectionStats.selectedVisibleCount > 0 &&
visibleSelectionStats.selectedVisibleCount < visibleSelectionStats.visibleCount}
- {allSelectedArePinned}
- {pinStateIsMixed}
- onSelectAllToggle={toggleSelectAllVisible}
- onBulkPinToggle={handleBulkPinToggle}
- onBulkExport={handleBulkExport}
- onBulkDelete={handleBulkDelete}
- onCloseSelection={exitSelectionMode}
+ visibleCount={visibleSelectionStats.visibleCount}
/>
</div>
{/if}
@@ -441,10 +441,10 @@
<DialogConversationRename
bind:open={renameDialogOpen}
- currentTitle={renameOriginalTitle}
bind:value={renameDraft}
- onConfirm={handleRenameConfirm}
+ currentTitle={renameOriginalTitle}
onCancel={handleRenameCancel}
+ onConfirm={handleRenameConfirm}
/>
<style>
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationActions.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationActions.svelte
index 42a0be707f..9df658e037 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationActions.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationActions.svelte
@@ -92,8 +92,8 @@
{#if isSearchModeActive}
<div class="px-4 my-2">
<SearchInput
- bind:value={searchQuery}
bind:ref={searchInputRef}
+ bind:value={searchQuery}
onClose={handleSearchModeDeactivate}
onKeyDown={(e) => e.key === 'Escape' && handleSearchModeDeactivate()}
placeholder="Search conversations..."
@@ -137,8 +137,8 @@
: ''}"
href={itemHref}
onclick={itemOnClick}
- variant="ghost"
size="default"
+ variant="ghost"
>
<span class="flex min-w-0 items-center px-0.5 gap-2">
{@render itemIcon(item.icon)}
@@ -186,15 +186,15 @@
{#if showIcons}
<div transition:fade={itemTransition}>
<ActionIcon
- icon={item.icon}
- tooltip={item.tooltip}
- tooltipSide={TooltipSide.RIGHT}
- size="lg"
- iconSize={ICON_CLASS_DEFAULT}
class="h-9 w-9 rounded-full hover:bg-accent! {isActive
? 'bg-accent text-accent-foreground'
: ''}"
+ icon={item.icon}
+ iconSize={ICON_CLASS_DEFAULT}
onclick={itemOnClick}
+ size="lg"
+ tooltip={item.tooltip}
+ tooltipSide={TooltipSide.RIGHT}
/>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationItem.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationItem.svelte
index a847e0aa92..f89753b3b8 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationItem.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationItem.svelte
@@ -162,33 +162,33 @@
: ''} px-2"
{...{ [UI_DATA_ATTRS.CONVERSATION_ROW]: conversation.id }}
onclick={(e) => handleSelect(e)}
- onmouseover={handleMouseOver}
- onmouseleave={handleMouseLeave}
- onmousedown={(e) => handleRowMouseDown(e)}
onfocusin={handleMouseOver}
onfocusout={(e) => {
if (!e.currentTarget.contains(e.relatedTarget as Node | null)) {
handleMouseLeave();
}
}}
+ onmousedown={(e) => handleRowMouseDown(e)}
+ onmouseleave={handleMouseLeave}
+ onmouseover={handleMouseOver}
>
<div
- class="flex min-w-0 flex-1 items-center gap-2"
style:padding-left="{depth * FORK_TREE_DEPTH_PADDING}px"
+ class="flex min-w-0 flex-1 items-center gap-2"
>
{#if isSelectionMode}
<div
+ aria-checked={isSelected}
+ aria-label={isSelected ? `Deselect ${conversation.name}` : `Select ${conversation.name}`}
class="shrink-0"
onclick={(e) => handleCheckboxClick(e)}
onkeydown={handleCheckboxKeydown}
role="checkbox"
- aria-checked={isSelected}
- aria-label={isSelected ? `Deselect ${conversation.name}` : `Select ${conversation.name}`}
tabindex="-1"
>
<Checkbox
- checked={isSelected}
aria-label={isSelected ? `Deselect ${conversation.name}` : `Select ${conversation.name}`}
+ checked={isSelected}
/>
</div>
{/if}
@@ -200,8 +200,8 @@
{#snippet child({ props })}
<a
{...props}
- href={RouterService.chat(conversation.forkedFromConversationId)}
class="flex shrink-0 items-center text-muted-foreground transition-colors hover:text-foreground"
+ href={RouterService.chat(conversation.forkedFromConversationId)}
>
<GitBranch class="h-3.5 w-3.5" />
</a>
@@ -218,12 +218,12 @@
<Tooltip.Root>
<Tooltip.Trigger>
<div
+ aria-label="Stop generation"
class="stop-button flex {ICON_CLASS_DEFAULT} shrink-0 cursor-pointer items-center justify-center rounded text-muted-foreground transition-colors hover:text-foreground"
onclick={handleStop}
onkeydown={(e) => e.key === 'Enter' && handleStop(e)}
role="button"
tabindex="0"
- aria-label="Stop generation"
>
<Loader2 class="loading-icon h-3.5 w-3.5 animate-spin" />
@@ -237,14 +237,12 @@
</Tooltip.Root>
{/if}
- <TruncatedText text={conversation.name} class="text-sm font-medium" showTooltip={false} />
+ <TruncatedText class="text-sm font-medium" showTooltip={false} text={conversation.name} />
</div>
{#if !isSelectionMode && renderActionsDropdown}
<div class="actions flex items-center">
<DropdownMenuActions
- triggerIcon={MoreHorizontal}
- triggerTooltip="More actions"
bind:open={dropdownOpen}
actions={[
{
@@ -284,6 +282,8 @@
variant: 'destructive'
}
]}
+ triggerIcon={MoreHorizontal}
+ triggerTooltip="More actions"
/>
</div>
{/if}
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationList.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationList.svelte
index d502248f93..bfbaae4cb9 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationList.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationList.svelte
@@ -80,19 +80,19 @@
{#if isSearchModeActive}
<SidebarNavigationSearchResults
class={className}
- {searchQuery}
- {filteredConversations}
{currentChatId}
- {onSelect}
- {onEdit}
- {onDelete}
- {onStop}
+ {filteredConversations}
{isSelectionMode}
- {selectedIds}
- {onToggleSelect}
+ {onDelete}
+ {onEdit}
{onEnterSelectionMode}
- {onSelectionClick}
{onRowMouseDown}
+ {onSelect}
+ {onSelectionClick}
+ {onStop}
+ {onToggleSelect}
+ {searchQuery}
+ {selectedIds}
/>
{:else}
{#if pinnedConversations.length > 0}
@@ -120,16 +120,16 @@
}}
{depth}
isActive={currentChatId === conversation.id}
- {isSelectionMode}
isSelected={selectedIds.has(conversation.id)}
- {onSelect}
- {onEdit}
+ {isSelectionMode}
{onDelete}
- {onStop}
- {onToggleSelect}
+ {onEdit}
{onEnterSelectionMode}
- {onSelectionClick}
{onRowMouseDown}
+ {onSelect}
+ {onSelectionClick}
+ {onStop}
+ {onToggleSelect}
/>
</li>
{/each}
@@ -160,16 +160,16 @@
}}
{depth}
isActive={currentChatId === conversation.id}
- {isSelectionMode}
isSelected={selectedIds.has(conversation.id)}
- {onSelect}
- {onEdit}
+ {isSelectionMode}
{onDelete}
- {onStop}
- {onToggleSelect}
+ {onEdit}
{onEnterSelectionMode}
- {onSelectionClick}
{onRowMouseDown}
+ {onSelect}
+ {onSelectionClick}
+ {onStop}
+ {onToggleSelect}
/>
</li>
{/each}
@@ -187,18 +187,18 @@
{#if isSelectionMode}
<SidebarNavigationSelectionBar
- class="sticky top-0 z-10 m-2 mt-0"
- selectedCount={selectedIds.size}
- {visibleCount}
{allVisibleSelected}
- {someVisibleSelected}
- someSelectedPinned={allSelectedArePinned}
- {pinStateIsMixed}
- {onSelectAllToggle}
- {onBulkPinToggle}
- {onBulkExport}
+ class="sticky top-0 z-10 m-2 mt-0"
{onBulkDelete}
+ {onBulkExport}
+ {onBulkPinToggle}
onClose={onCloseSelection}
+ {onSelectAllToggle}
+ {pinStateIsMixed}
+ selectedCount={selectedIds.size}
+ someSelectedPinned={allSelectedArePinned}
+ {someVisibleSelected}
+ {visibleCount}
/>
{/if}
{/if}
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearch.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearch.svelte
index 486d20eb8b..0e2767c73a 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearch.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearch.svelte
@@ -17,5 +17,5 @@
</script>
<div class="mb-4 px-2 {className}">
- <SearchInput bind:value {placeholder} {onInput} />
+ <SearchInput bind:value {onInput} {placeholder} />
</div>
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearchResults.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearchResults.svelte
index f56ac6af7f..cc8f10bceb 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearchResults.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSearchResults.svelte
@@ -68,16 +68,16 @@
}}
{depth}
isActive={currentChatId === conversation.id}
- {isSelectionMode}
isSelected={selectedIds.has(conversation.id)}
- {onSelect}
- {onEdit}
+ {isSelectionMode}
{onDelete}
- {onStop}
- {onToggleSelect}
+ {onEdit}
{onEnterSelectionMode}
- {onSelectionClick}
{onRowMouseDown}
+ {onSelect}
+ {onSelectionClick}
+ {onStop}
+ {onToggleSelect}
/>
</li>
{/each}
diff --git a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSelectionBar.svelte b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSelectionBar.svelte
index 60ae1e6709..e0e547d519 100644
--- a/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSelectionBar.svelte
+++ b/tools/ui/src/lib/components/app/navigation/SidebarNavigation/SidebarNavigationSelectionBar.svelte
@@ -71,16 +71,16 @@
</script>
<div
- role="toolbar"
aria-label="Bulk actions for selected conversations"
class="flex items-center gap-1.5 rounded-xl border border-border/50 bg-background/50 px-2 py-1.5 shadow-sm backdrop-blur-xl {className}"
+ role="toolbar"
>
<label class="flex min-w-0 cursor-pointer items-center gap-2">
<Checkbox
+ aria-label={isMasterChecked ? 'Deselect all' : 'Select all'}
checked={isMasterChecked}
indeterminate={isMasterIndeterminate}
onCheckedChange={onSelectAllToggle}
- aria-label={isMasterChecked ? 'Deselect all' : 'Select all'}
/>
<span class="truncate text-xs font-medium text-muted-foreground">
@@ -90,74 +90,74 @@
<div class="ml-auto flex items-center gap-0.75">
<ActionIcon
- icon={someSelectedPinned ? PinOff : Pin}
- tooltip={pinTooltip}
- tooltipSide={TooltipSide.TOP}
- disabled={pinDisabled}
ariaLabel={pinTooltip}
- size="sm"
- iconSize="h-3.5 w-3.5"
class="h-7 w-7 rounded-md bg-transparent backdrop-blur-none hover:bg-accent! {pinDisabled
? 'cursor-not-allowed'
: ''} {!pinDisabled ? 'opacity-100' : 'opacity-40'}"
+ disabled={pinDisabled}
+ icon={someSelectedPinned ? PinOff : Pin}
+ iconSize="h-3.5 w-3.5"
onclick={onBulkPinToggle}
+ size="sm"
+ tooltip={pinTooltip}
+ tooltipSide={TooltipSide.TOP}
/>
<ActionIcon
- icon={Download}
- tooltip={hasSelection ? 'Export' : 'Export'}
- tooltipSide={TooltipSide.TOP}
- disabled={!hasSelection}
ariaLabel="Export selected"
- size="sm"
- iconSize="h-3.5 w-3.5"
class="h-7 w-7 rounded-md bg-transparent backdrop-blur-none hover:bg-accent! {hasSelection
? 'opacity-100'
: 'opacity-40'}"
+ disabled={!hasSelection}
+ icon={Download}
+ iconSize="h-3.5 w-3.5"
onclick={onBulkExport}
+ size="sm"
+ tooltip={hasSelection ? 'Export' : 'Export'}
+ tooltipSide={TooltipSide.TOP}
/>
<ActionIcon
- icon={Trash2}
- tooltip="Delete selected"
- tooltipSide={TooltipSide.TOP}
- disabled={!hasSelection}
ariaLabel="Delete selected"
- size="sm"
- iconSize="h-3.5 w-3.5 text-destructive"
class="h-7 w-7 rounded-md bg-transparent backdrop-blur-none hover:bg-destructive/10! dark:hover:bg-destructive/20! disabled:hover:bg-transparent {hasSelection
? 'opacity-100'
: 'opacity-40'}"
+ disabled={!hasSelection}
+ icon={Trash2}
+ iconSize="h-3.5 w-3.5 text-destructive"
onclick={handleDeleteClick}
+ size="sm"
+ tooltip="Delete selected"
+ tooltipSide={TooltipSide.TOP}
/>
- <div class="mx-1 h-4 w-px bg-border" aria-hidden="true"></div>
+ <div aria-hidden="true" class="mx-1 h-4 w-px bg-border"></div>
<ActionIcon
- icon={X}
- tooltip="Exit bulk selection mode"
- tooltipSide={TooltipSide.TOP}
ariaLabel="Exit bulk selection mode"
- size="sm"
- iconSize="h-3.5 w-3.5"
class="h-7 w-7 rounded-md bg-transparent backdrop-blur-none hover:bg-accent!"
+ icon={X}
+ iconSize="h-3.5 w-3.5"
onclick={onClose}
+ size="sm"
+ tooltip="Exit bulk selection mode"
+ tooltipSide={TooltipSide.TOP}
/>
</div>
</div>
<DialogConfirmation
bind:open={showDeleteDialog}
- title="Delete {selectedCount} conversation{selectedCount === 1 ? '' : 's'}"
+ cancelText="Cancel"
+ confirmText={selectedCount === 1 ? 'Delete' : `Delete ${selectedCount}`}
description="This action cannot be undone. The selected conversation{selectedCount === 1
? ''
: 's'} and {selectedCount === 1
? 'its'
: 'their'} messages will be permanently removed, including any forks."
- confirmText={selectedCount === 1 ? 'Delete' : `Delete ${selectedCount}`}
- cancelText="Cancel"
- variant="destructive"
icon={Trash2}
- onConfirm={handleDeleteConfirm}
onCancel={handleDeleteCancel}
+ onConfirm={handleDeleteConfirm}
+ title="Delete {selectedCount} conversation{selectedCount === 1 ? '' : 's'}"
+ variant="destructive"
/>
diff --git a/tools/ui/src/lib/components/app/server/ServerErrorSplash.svelte b/tools/ui/src/lib/components/app/server/ServerErrorSplash.svelte
index fbdbf19f29..e8154e5ce2 100644
--- a/tools/ui/src/lib/components/app/server/ServerErrorSplash.svelte
+++ b/tools/ui/src/lib/components/app/server/ServerErrorSplash.svelte
@@ -127,7 +127,7 @@
<div class="flex h-full items-center justify-center {className}">
<div class="w-full max-w-md px-4 text-center">
- <div class="mb-6" in:fade={{ duration: 300 }}>
+ <div in:fade={{ duration: 300 }} class="mb-6">
<div
class="mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-destructive/10"
>
@@ -143,7 +143,7 @@
{#if isAccessDeniedError && !showApiKeyInput}
<div in:fly={{ delay: 200, duration: 300, y: 10 }} class="mb-4">
- <Button onclick={handleShowApiKeyInput} variant="outline" class="w-full">
+ <Button class="w-full" onclick={handleShowApiKeyInput} variant="outline">
<Key class={ICON_CLASS_DEFAULT} />
Enter API Key
</Button>
@@ -153,61 +153,65 @@
{#if showApiKeyInput}
<div in:fly={{ delay: 200, duration: 300, y: 10 }} class="mb-4 space-y-3 text-left">
<div class="space-y-2">
- <Label for="api-key-input" class="text-sm font-medium">API Key</Label>
+ <Label class="text-sm font-medium" for="api-key-input">API Key</Label>
<div class="relative">
<Input
- id="api-key-input"
- type="password"
- autocomplete="new-password"
- placeholder="Enter your API key..."
bind:value={apiKeyInput}
- onkeydown={handleApiKeyKeydown}
+ autocomplete="new-password"
class="w-full pr-10 {apiKeyState === 'error'
? 'border-destructive'
: apiKeyState === 'success'
? 'border-green-500'
: ''}"
disabled={apiKeyState === 'validating'}
+ id="api-key-input"
+ onkeydown={handleApiKeyKeydown}
+ placeholder="Enter your API key..."
+ type="password"
/>
+
{#if apiKeyState === 'validating'}
<div class="absolute top-1/2 right-3 -translate-y-1/2">
<RefreshCw class="{ICON_CLASS_DEFAULT} animate-spin text-muted-foreground" />
</div>
{:else if apiKeyState === 'success'}
<div
- class="absolute top-1/2 right-3 -translate-y-1/2"
in:scale={{ duration: 200, start: 0.8 }}
+ class="absolute top-1/2 right-3 -translate-y-1/2"
>
<CheckCircle class="{ICON_CLASS_DEFAULT} text-green-500" />
</div>
{:else if apiKeyState === 'error'}
<div
- class="absolute top-1/2 right-3 -translate-y-1/2"
in:scale={{ duration: 200, start: 0.8 }}
+ class="absolute top-1/2 right-3 -translate-y-1/2"
>
<XCircle class="{ICON_CLASS_DEFAULT} text-destructive" />
</div>
{/if}
</div>
+
{#if apiKeyError}
- <p class="text-sm text-destructive" in:fly={{ duration: 200, y: -10 }}>
+ <p in:fly={{ duration: 200, y: -10 }} class="text-sm text-destructive">
{apiKeyError}
</p>
{/if}
+
{#if apiKeyState === 'success'}
- <p class="text-sm text-green-600" in:fly={{ duration: 200, y: -10 }}>
+ <p in:fly={{ duration: 200, y: -10 }} class="text-sm text-green-600">
✓ API key validated successfully! Connecting...
</p>
{/if}
</div>
+
<div class="flex gap-2">
<Button
- onclick={handleSaveApiKey}
+ class="flex-1"
disabled={!apiKeyInput.trim() ||
apiKeyState === 'validating' ||
apiKeyState === 'success'}
- class="flex-1"
+ onclick={handleSaveApiKey}
>
{#if apiKeyState === 'validating'}
<RefreshCw class="{ICON_CLASS_DEFAULT} animate-spin" />
@@ -218,15 +222,16 @@
Save & Retry
{/if}
</Button>
+
<Button
+ class="flex-1"
+ disabled={apiKeyState === 'validating'}
onclick={() => {
showApiKeyInput = false;
apiKeyState = 'idle';
apiKeyError = '';
}}
variant="outline"
- class="flex-1"
- disabled={apiKeyState === 'validating'}
>
Cancel
</Button>
@@ -236,7 +241,7 @@
{#if showRetry}
<div in:fly={{ delay: 200, duration: 300, y: 10 }}>
- <Button onclick={handleRetryConnection} disabled={isServerLoading} class="w-full">
+ <Button class="w-full" disabled={isServerLoading} onclick={handleRetryConnection}>
{#if isServerLoading}
<RefreshCw class="{ICON_CLASS_DEFAULT} animate-spin" />
@@ -251,7 +256,7 @@
{/if}
{#if showTroubleshooting}
- <div class="mt-4 text-left" in:fly={{ delay: 400, duration: 300, y: 10 }}>
+ <div in:fly={{ delay: 400, duration: 300, y: 10 }} class="mt-4 text-left">
<details class="text-sm">
<summary class="cursor-pointer text-muted-foreground hover:text-foreground">
Troubleshooting
@@ -271,6 +276,7 @@
<p class="mt-1">llama-server -m locally-stored-model.gguf</p>
</div>
</div>
+
<ul class="list-disc space-y-1 pl-4">
<li>Check that the server is accessible at the correct URL</li>
diff --git a/tools/ui/src/lib/components/app/server/ServerLoadingSplash.svelte b/tools/ui/src/lib/components/app/server/ServerLoadingSplash.svelte
index 95fa61e936..f01d69aa27 100644
--- a/tools/ui/src/lib/components/app/server/ServerLoadingSplash.svelte
+++ b/tools/ui/src/lib/components/app/server/ServerLoadingSplash.svelte
@@ -13,7 +13,7 @@
<div class="flex h-full items-center justify-center {className}">
<div class="text-center">
- <div class="mb-4" in:fade={{ duration: 300 }}>
+ <div in:fade={{ duration: 300 }} class="mb-4">
<div class="mx-auto mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-muted">
<Server class="h-8 w-8 animate-pulse text-muted-foreground" />
</div>
diff --git a/tools/ui/src/lib/components/app/server/ServerStatus.svelte b/tools/ui/src/lib/components/app/server/ServerStatus.svelte
index a26f50b5b9..e06baf2687 100644
--- a/tools/ui/src/lib/components/app/server/ServerStatus.svelte
+++ b/tools/ui/src/lib/components/app/server/ServerStatus.svelte
@@ -46,21 +46,21 @@
</div>
{#if serverData && !error}
- <Badge variant="outline" class="text-xs">
+ <Badge class="text-xs" variant="outline">
<Server class="mr-1 h-3 w-3" />
{model || 'Unknown Model'}
</Badge>
{#if serverData?.default_generation_settings?.n_ctx}
- <Badge variant="secondary" class="text-xs">
+ <Badge class="text-xs" variant="secondary">
ctx: {serverData.default_generation_settings.n_ctx.toLocaleString()}
</Badge>
{/if}
{/if}
{#if showActions && error}
- <Button variant="outline" size="sm" class="text-destructive">
+ <Button class="text-destructive" size="sm" variant="outline">
<AlertTriangle class={ICON_CLASS_DEFAULT} />
{error}
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte
index 97ff30ba7a..347e8484bd 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte
@@ -123,21 +123,21 @@
}
</script>
-<div class="mx-auto flex h-full w-full flex-col md:pl-8" in:fade={{ duration: 150 }}>
+<div in:fade={{ duration: 150 }} class="mx-auto flex h-full w-full flex-col md:pl-8">
<div class="flex flex-1 flex-col gap-4 md:flex-row">
<SettingsChatDesktopSidebar
- sections={SETTINGS_CHAT_SECTIONS}
- isActive={(section: SettingsSection) => section.slug === activeSlug}
getHref={getSectionHref ??
((section: SettingsSection) => RouterService.settings(section.slug))}
+ isActive={(section: SettingsSection) => section.slug === activeSlug}
+ sections={SETTINGS_CHAT_SECTIONS}
/>
<SettingsChatMobileHeader
- sections={SETTINGS_CHAT_SECTIONS}
- isActive={(section: SettingsSection) => section.slug === activeSlug}
+ bind:this={mobileHeader}
getHref={getSectionHref ??
((section: SettingsSection) => RouterService.settings(section.slug))}
- bind:this={mobileHeader}
+ isActive={(section: SettingsSection) => section.slug === activeSlug}
+ sections={SETTINGS_CHAT_SECTIONS}
/>
<div class="mx-auto max-w-3xl flex-1">
@@ -145,6 +145,7 @@
<div class="grid">
<div class="mb-6 flex items-center gap-2 border-b border-border/30 pb-6 md:flex">
<currentSection.icon class="h-5 w-5" />
+
<h3 class="text-lg font-semibold">{currentSection.title}</h3>
</div>
@@ -163,7 +164,7 @@
{#if currentSection.slug === SETTINGS_SECTION_SLUGS.GENERAL}
<div class="flex justify-end">
- <Button variant="outline" onclick={() => window.location.reload()}>
+ <Button onclick={() => window.location.reload()} variant="outline">
<RefreshCw class="h-3 w-3" />
Reload app
</Button>
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte
index d5d93e11d7..e8795d7c52 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte
@@ -66,13 +66,14 @@
})()}
<div class="flex items-center gap-2">
- <Label for={field.key} class="flex items-center gap-1.5 text-sm font-medium">
+ <Label class="flex items-center gap-1.5 text-sm font-medium" for={field.key}>
{field.label}
{#if field.isExperimental}
<FlaskConical class="h-3.5 w-3.5 text-muted-foreground" />
{/if}
</Label>
+
{#if isCustomRealTime}
<SettingsChatParameterSourceIndicator />
{/if}
@@ -80,9 +81,9 @@
<div class="relative w-full">
<Input
+ autocomplete={field.isPrivate ? 'new-password' : undefined}
id={field.key}
type={field.isPrivate ? 'password' : field.isPositiveInteger ? 'number' : 'text'}
- autocomplete={field.isPrivate ? 'new-password' : undefined}
{...field.isPositiveInteger
? {
min: String(field.min ?? 1),
@@ -90,28 +91,30 @@
...(field.max != null ? { max: String(field.max) } : {})
}
: {}}
- value={currentValue}
+ class="w-full {isCustomRealTime ? 'pr-8' : ''}"
oninput={(e) => onConfigChange(field.key, e.currentTarget.value)}
placeholder={currentModelParams[field.key] != null
? `Default: ${normalizeFloatingPoint(currentModelParams[field.key])}`
: (field.placeholder ?? '')}
- class="w-full {isCustomRealTime ? 'pr-8' : ''}"
+ value={currentValue}
/>
+
{#if isCustomRealTime}
<button
- type="button"
+ aria-label="Reset to default"
+ class="absolute top-1/2 right-2 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded transition-colors hover:bg-muted"
onclick={() => {
settingsStore.resetParameterToServerDefault(field.key);
onConfigChange(field.key, '');
}}
- class="absolute top-1/2 right-2 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded transition-colors hover:bg-muted"
- aria-label="Reset to default"
title="Reset to default"
+ type="button"
>
<RotateCcw class="h-3 w-3" />
</button>
{/if}
</div>
+
{#if field.help || SETTING_CONFIG_INFO[field.key]}
<p class="mt-1 text-xs text-muted-foreground">
{@html field.help || SETTING_CONFIG_INFO[field.key]}
@@ -119,7 +122,7 @@
{/if}
{:else if field.type === SettingsFieldType.TEXTAREA}
{#if field.label}
- <Label for={field.key} class="block flex items-center gap-1.5 text-sm font-medium">
+ <Label class="block flex items-center gap-1.5 text-sm font-medium" for={field.key}>
{field.label}
{#if field.isExperimental}
@@ -129,11 +132,11 @@
{/if}
<Textarea
+ class="min-h-[10rem] w-full md:max-w-3xl"
id={field.key}
- value={String(localConfig[field.key] ?? '')}
onchange={(e) => onConfigChange(field.key, e.currentTarget.value)}
placeholder=""
- class="min-h-[10rem] w-full md:max-w-3xl"
+ value={String(localConfig[field.key] ?? '')}
/>
{#if field.help || SETTING_CONFIG_INFO[field.key]}
@@ -145,13 +148,13 @@
{#if field.key === SETTINGS_KEYS.SYSTEM_MESSAGE}
<div class="mt-3 flex items-center gap-2">
<Checkbox
- id="showSystemMessage"
checked={Boolean(localConfig.showSystemMessage ?? true)}
+ id="showSystemMessage"
onCheckedChange={(checked) =>
onConfigChange(SETTINGS_KEYS.SHOW_SYSTEM_MESSAGE, Boolean(checked))}
/>
- <Label for="showSystemMessage" class="cursor-pointer text-sm font-normal">
+ <Label class="cursor-pointer text-sm font-normal" for="showSystemMessage">
Show system message in conversations
</Label>
</div>
@@ -172,21 +175,20 @@
})()}
<div class="flex items-center gap-2">
- <Label for={field.key} class="flex items-center gap-1.5 text-sm font-medium">
+ <Label class="flex items-center gap-1.5 text-sm font-medium" for={field.key}>
{field.label}
{#if field.isExperimental}
<FlaskConical class="h-3.5 w-3.5 text-muted-foreground" />
{/if}
</Label>
+
{#if isCustomRealTime}
<SettingsChatParameterSourceIndicator />
{/if}
</div>
<Select.Root
- type="single"
- value={currentValue}
onValueChange={(value) => {
if (field.key === SETTINGS_KEYS.THEME && value && onThemeChange) {
onThemeChange(value);
@@ -194,6 +196,8 @@
onConfigChange(field.key, value);
}
}}
+ type="single"
+ value={currentValue}
>
<div class="relative w-full md:w-auto">
<Select.Trigger class="w-full">
@@ -206,25 +210,27 @@
{selectedOption?.label || `Select ${field.label.toLowerCase()}`}
</div>
</Select.Trigger>
+
{#if isCustomRealTime}
<button
- type="button"
+ aria-label="Reset to default"
+ class="absolute top-1/2 right-8 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded transition-colors hover:bg-muted"
onclick={() => {
settingsStore.resetParameterToServerDefault(field.key);
onConfigChange(field.key, '');
}}
- class="absolute top-1/2 right-8 inline-flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded transition-colors hover:bg-muted"
- aria-label="Reset to default"
title="Reset to default"
+ type="button"
>
<RotateCcw class="h-3 w-3" />
</button>
{/if}
</div>
+
<Select.Content>
{#if field.options}
{#each field.options as option (option.value)}
- <Select.Item value={option.value} label={option.label}>
+ <Select.Item label={option.label} value={option.value}>
<div class="flex items-center gap-2">
{#if option.icon}
{@const IconComponent = option.icon}
@@ -237,6 +243,7 @@
{/if}
</Select.Content>
</Select.Root>
+
{#if field.help || SETTING_CONFIG_INFO[field.key]}
<p class="mt-1 text-xs text-muted-foreground">
{field.help || SETTING_CONFIG_INFO[field.key]}
@@ -258,20 +265,21 @@
<RadioGroup.Root
class="gap-4"
- value={currentMode}
onValueChange={(value) => {
for (const opt of radioOptions) {
onConfigChange(opt.key, opt.value === value);
}
}}
+ value={currentMode}
>
{#each radioOptions as opt (opt.value)}
{@const itemId = `${field.key}-${opt.value}`}
<div class="flex items-center gap-2">
- <RadioGroup.Item value={opt.value} id={itemId} />
+ <RadioGroup.Item id={itemId} value={opt.value} />
+
<Label
- for={itemId}
class="flex cursor-pointer items-center gap-1.5 text-sm font-normal"
+ for={itemId}
>
{opt.label}
@@ -291,16 +299,16 @@
{:else if field.type === SettingsFieldType.CHECKBOX}
<div class="flex items-start space-x-3">
<Checkbox
- id={field.key}
checked={Boolean(localConfig[field.key])}
- onCheckedChange={(checked) => onConfigChange(field.key, checked)}
class="mt-1"
+ id={field.key}
+ onCheckedChange={(checked) => onConfigChange(field.key, checked)}
/>
<div class="space-y-1">
<label
- for={field.key}
class="flex cursor-pointer items-center gap-1.5 pt-1 pb-0.5 text-sm leading-none font-medium"
+ for={field.key}
>
{field.label}
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatImportExportTab.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatImportExportTab.svelte
index 0fb5cd11a3..d42bb5b1ce 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatImportExportTab.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatImportExportTab.svelte
@@ -261,92 +261,92 @@
}
</script>
-<div class="space-y-12" in:fade={{ duration: 150 }}>
+<div in:fade={{ duration: 150 }} class="space-y-12">
<SettingsGroup title="Conversations">
<SettingsChatImportExportSection
- title="Export"
- description="Download your conversations as a ZIP of JSONL files. This includes all messages, attachments, and conversation history."
IconComponent={Download}
buttonText="Export conversations"
+ description="Download your conversations as a ZIP of JSONL files. This includes all messages, attachments, and conversation history."
onclick={handleExportClick}
summary={{ items: exportedConversations, show: showExportSummary, verb: 'Exported' }}
+ title="Export"
/>
<SettingsChatImportExportSection
- title="Import"
- description="Import one or more conversations from a previously exported ZIP or JSONL file. This will merge with your existing conversations."
IconComponent={Upload}
buttonText="Import conversations"
+ description="Import one or more conversations from a previously exported ZIP or JSONL file. This will merge with your existing conversations."
onclick={handleImportClick}
summary={{ items: importedConversations, show: showImportSummary, verb: 'Imported' }}
+ title="Import"
/>
<SettingsChatImportExportSection
- title="Delete All"
- description="Permanently delete all conversations and their messages. This action cannot be undone. Consider exporting your conversations first if you want to keep a backup."
IconComponent={Trash2}
+ buttonClass="text-destructive-foreground justify-start justify-self-start bg-destructive hover:bg-destructive/80 md:w-auto"
buttonText="Delete all conversations"
+ buttonVariant="destructive"
+ description="Permanently delete all conversations and their messages. This action cannot be undone. Consider exporting your conversations first if you want to keep a backup."
onclick={handleDeleteAllClick}
+ title="Delete All"
titleClass="text-destructive"
- buttonVariant="destructive"
- buttonClass="text-destructive-foreground justify-start justify-self-start bg-destructive hover:bg-destructive/80 md:w-auto"
/>
</SettingsGroup>
<SettingsGroup title="Settings">
<SettingsChatImportExportSection
- title="Export"
- description="Export your chat settings and preferences as a JSON file."
IconComponent={Download}
buttonText="Export settings"
+ description="Export your chat settings and preferences as a JSON file."
onclick={handleSettingsExport}
summary={{ items: [], show: showSettingsExportSummary, verb: 'Exported' }}
+ title="Export"
/>
<SettingsChatImportExportSection
- title="Import"
- description="Import chat settings from a previously exported JSON file. This will merge with your existing settings."
IconComponent={Upload}
buttonText="Import settings"
+ description="Import chat settings from a previously exported JSON file. This will merge with your existing settings."
onclick={handleSettingsImport}
summary={{ items: [], show: showSettingsImportSummary, verb: 'Imported' }}
+ title="Import"
/>
</SettingsGroup>
</div>
<DialogExportSettings
- bind:open={showSettingsExportDialog}
bind:includeSensitiveData
- onConfirm={handleSettingsExportConfirm}
+ bind:open={showSettingsExportDialog}
onCancel={handleSettingsExportCancel}
+ onConfirm={handleSettingsExportConfirm}
/>
<DialogConversationSelection
+ bind:open={showExportDialog}
conversations={availableConversations}
{messageCountMap}
mode={ConversationSelectionMode.EXPORT}
- bind:open={showExportDialog}
onCancel={() => (showExportDialog = false)}
onConfirm={handleExportConfirm}
/>
<DialogConversationSelection
+ bind:open={showImportDialog}
conversations={availableConversations}
{messageCountMap}
mode={ConversationSelectionMode.IMPORT}
- bind:open={showImportDialog}
onCancel={() => (showImportDialog = false)}
onConfirm={handleImportConfirm}
/>
<DialogConfirmation
bind:open={showDeleteDialog}
- title="Delete all conversations"
- description="Are you sure you want to delete all conversations? This action cannot be undone and will permanently remove all your conversations and messages."
- confirmText="Delete All"
cancelText="Cancel"
- variant="destructive"
+ confirmText="Delete All"
+ description="Are you sure you want to delete all conversations? This action cannot be undone and will permanently remove all your conversations and messages."
icon={Trash2}
- onConfirm={handleDeleteAllConfirm}
onCancel={handleDeleteAllCancel}
+ onConfirm={handleDeleteAllConfirm}
+ title="Delete all conversations"
+ variant="destructive"
/>
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatParameterSourceIndicator.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatParameterSourceIndicator.svelte
index 1407eb87eb..2efebfb263 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatParameterSourceIndicator.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatParameterSourceIndicator.svelte
@@ -10,8 +10,8 @@
</script>
<Badge
- variant="secondary"
class="h-5 bg-orange-100 px-1.5 py-0.5 text-xs text-orange-800 dark:bg-orange-900 dark:text-orange-200 {className}"
+ variant="secondary"
>
<Wrench class="mr-1 h-3 w-3" />
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatToolsTab.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatToolsTab.svelte
index 08046b0845..634497524a 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatToolsTab.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatToolsTab.svelte
@@ -27,7 +27,7 @@
<div class="space-y-2">
{#each groups as group (group.key)}
{@const isExpanded = expandedGroups.has(group.key)}
- <Collapsible.Root open={isExpanded} onOpenChange={() => toggleExpanded(group.key)}>
+ <Collapsible.Root onOpenChange={() => toggleExpanded(group.key)} open={isExpanded}>
<Collapsible.Trigger
class="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm hover:bg-muted/50"
>
@@ -42,14 +42,14 @@
<span class="inline-flex min-w-0 items-center gap-1.5 font-medium">
{#if group.source === 'mcp'}
<McpServerIdentity
+ displayName={group.label}
+ {faviconUrl}
iconClass={ICON_CLASS_DEFAULT}
iconRounded="rounded-sm"
showVersion={false}
- displayName={group.label}
- {faviconUrl}
/>
{:else}
- <TruncatedText text={group.label} class="font-medium" />
+ <TruncatedText class="font-medium" text={group.label} />
{/if}
</span>
@@ -63,7 +63,9 @@
<!-- Header row -->
<div class="flex items-center gap-2 px-2 py-1 text-xs text-muted-foreground">
<span class="min-w-0 flex-1">Tool</span>
+
<span class="w-16 shrink-0 text-center">Enabled</span>
+
<span class="w-20 shrink-0 text-center">Always allow</span>
</div>
@@ -84,20 +86,22 @@
{#if IconComponent}
<IconComponent class={ICON_CLASS_DEFAULT} />
{/if}
- <TruncatedText text={displayLabel} class="min-w-0" showTooltip={true} />
+
+ <TruncatedText class="min-w-0" showTooltip={true} text={displayLabel} />
</span>
<div class="flex w-16 shrink-0 justify-center">
<Checkbox
checked={isEnabled}
- onCheckedChange={() => toolsStore.toggleTool(entry.key)}
class={ICON_CLASS_DEFAULT}
+ onCheckedChange={() => toolsStore.toggleTool(entry.key)}
/>
</div>
<div class="flex w-20 shrink-0 justify-center">
<Checkbox
checked={isAlwaysAllowed}
+ class={ICON_CLASS_DEFAULT}
onCheckedChange={() => {
if (isAlwaysAllowed) {
permissionsStore.revokeTool(permissionKey);
@@ -105,7 +109,6 @@
permissionsStore.allowTool(permissionKey);
}
}}
- class={ICON_CLASS_DEFAULT}
/>
</div>
</div>
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChatDesktopSidebar.svelte b/tools/ui/src/lib/components/app/settings/SettingsChatDesktopSidebar.svelte
index da1fe778bd..08671da2ff 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChatDesktopSidebar.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChatDesktopSidebar.svelte
@@ -32,6 +32,7 @@
href={getHref(section)}
>
<section.icon class={ICON_CLASS_DEFAULT} />
+
<span class="ml-2">{section.title}</span>
</a>
{:else}
@@ -44,6 +45,7 @@
onclick={() => onSectionChange?.(section.title)}
>
<section.icon class={ICON_CLASS_DEFAULT} />
+
<span class="ml-2">{section.title}</span>
</button>
{/if}
diff --git a/tools/ui/src/lib/components/app/settings/SettingsChatMobileHeader.svelte b/tools/ui/src/lib/components/app/settings/SettingsChatMobileHeader.svelte
index 1e8c76f8e3..887d28489c 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsChatMobileHeader.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsChatMobileHeader.svelte
@@ -45,7 +45,7 @@
</div>
<div class="border-b border-border/30 py-2">
- <ScrollCarousel {carousel} alwaysShowArrows containerClass="py-2" innerClass="gap-2">
+ <ScrollCarousel alwaysShowArrows {carousel} containerClass="py-2" innerClass="gap-2">
{#each sections as section (section.title)}
{#if getHref}
<a
@@ -61,6 +61,7 @@
}}
>
<section.icon class="{ICON_CLASS_DEFAULT} flex-shrink-0" />
+
<span>{section.title}</span>
</a>
{:else}
@@ -77,6 +78,7 @@
}}
>
<section.icon class="{ICON_CLASS_DEFAULT} flex-shrink-0" />
+
<span>{section.title}</span>
</button>
{/if}
diff --git a/tools/ui/src/lib/components/app/settings/SettingsFooter.svelte b/tools/ui/src/lib/components/app/settings/SettingsFooter.svelte
index e5c8dcd2e5..0f59a831f9 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsFooter.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsFooter.svelte
@@ -31,7 +31,7 @@
<div class="sticky bottom-0 mx-auto mt-4 flex w-full justify-between p-6">
<div class="flex gap-2">
- <Button variant="outline" onclick={handleResetClick}>
+ <Button onclick={handleResetClick} variant="outline">
<RotateCcw class="h-3 w-3" />
Reset to default
@@ -45,14 +45,17 @@
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title>Reset Settings to Default</AlertDialog.Title>
+
<AlertDialog.Description>
Are you sure you want to reset all settings to their default values? This will reset all
parameters to the values provided by the server's /props endpoint and remove all your custom
configurations.
</AlertDialog.Description>
</AlertDialog.Header>
+
<AlertDialog.Footer>
<AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
+
<AlertDialog.Action onclick={handleConfirmReset}>Reset to Default</AlertDialog.Action>
</AlertDialog.Footer>
</AlertDialog.Content>
diff --git a/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte b/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte
index 23736ef1c1..5cbd249f1e 100644
--- a/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte
+++ b/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte
@@ -73,7 +73,7 @@
<div in:fade={{ duration: 150 }} class="flex min-h-[calc(100dvh-4rem)] flex-col">
<div class="fixed top-4.5 right-4 z-50 md:hidden">
- <ActionIcon icon={X} tooltip="Close" onclick={handleClose} />
+ <ActionIcon icon={X} onclick={handleClose} tooltip="Close" />
</div>
<div
@@ -102,7 +102,7 @@
</Empty.Header>
<Empty.Content>
- <Button size="sm" onclick={() => (isAddingServer = true)}>
+ <Button onclick={() => (isAddingServer = true)} size="sm">
<Plus />
Add New Server
@@ -120,8 +120,8 @@
<McpServerCardSkeleton />
{:else}
<McpServerCard
- {server}
enabled={conversationsStore.preferences.isMcpServerEnabledForChat(server.id)}
+ onDelete={() => mcpStore.removeServer(server.id)}
onToggle={async () => {
const wasEnabled = conversationsStore.preferences.isMcpServerEnabledForChat(
server.id
@@ -137,7 +137,7 @@
}
}}
onUpdate={(updates) => mcpStore.updateServer(server.id, updates)}
- onDelete={() => mcpStore.removeServer(server.id)}
+ {server}
/>
{/if}
{/each}
@@ -155,7 +155,7 @@
</Empty.Header>
<Empty.Content>
- <Button size="sm" onclick={() => (isAddingServer = true)}>
+ <Button onclick={() => (isAddingServer = true)} size="sm">
<Plus />
Add New Server
diff --git a/tools/ui/src/lib/components/pwa/PwaMetaTags.svelte b/tools/ui/src/lib/components/pwa/PwaMetaTags.svelte
index 584f2ee834..846251cd61 100644
--- a/tools/ui/src/lib/components/pwa/PwaMetaTags.svelte
+++ b/tools/ui/src/lib/components/pwa/PwaMetaTags.svelte
@@ -6,17 +6,20 @@
<svelte:head>
<!-- Theme color for light/dark modes -->
- <meta name="theme-color" content={THEME_COLORS.LIGHT} media={MEDIA_QUERIES.PREFERS_LIGHT} />
- <meta name="theme-color" content={THEME_COLORS.DARK} media={MEDIA_QUERIES.PREFERS_DARK} />
+ <meta content={THEME_COLORS.LIGHT} media={MEDIA_QUERIES.PREFERS_LIGHT} name="theme-color" />
+
+ <meta content={THEME_COLORS.DARK} media={MEDIA_QUERIES.PREFERS_DARK} name="theme-color" />
<!-- Apple mobile web app meta tags -->
<meta
- name={APPLE_META_TAGS.MOBILE_WEB_APP_CAPABLE.name}
content={APPLE_META_TAGS.MOBILE_WEB_APP_CAPABLE.content}
+ name={APPLE_META_TAGS.MOBILE_WEB_APP_CAPABLE.name}
/>
+
<meta
- name={APPLE_META_TAGS.STATUS_BAR_STYLE.name}
content={APPLE_META_TAGS.STATUS_BAR_STYLE.content}
+ name={APPLE_META_TAGS.STATUS_BAR_STYLE.name}
/>
- <meta name={APPLE_META_TAGS.MOBILE_WEB_APP_TITLE.name} content={appName} />
+
+ <meta content={appName} name={APPLE_META_TAGS.MOBILE_WEB_APP_TITLE.name} />
</svelte:head>
diff --git a/tools/ui/src/lib/components/pwa/PwaRefreshAlert.svelte b/tools/ui/src/lib/components/pwa/PwaRefreshAlert.svelte
index 0976e96464..56a71406ff 100644
--- a/tools/ui/src/lib/components/pwa/PwaRefreshAlert.svelte
+++ b/tools/ui/src/lib/components/pwa/PwaRefreshAlert.svelte
@@ -17,7 +17,6 @@
<Button
class="justify-self-end-safe"
- size="sm"
onclick={() => {
updateServiceWorker();
@@ -27,6 +26,7 @@
needRefresh = false;
}}
+ size="sm"
>
Reload
</Button>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
index 33f2fa584a..fcf133becf 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
@@ -12,7 +12,7 @@
<AlertDialogPrimitive.Action
bind:ref
- data-slot="alert-dialog-action"
class={cn(buttonVariants(), className)}
+ data-slot="alert-dialog-action"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
index 2a6ad68141..65d8037650 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
@@ -12,7 +12,7 @@
<AlertDialogPrimitive.Cancel
bind:ref
- data-slot="alert-dialog-cancel"
class={cn(buttonVariants({ variant: 'outline' }), className)}
+ data-slot="alert-dialog-cancel"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
index b3b2908044..a9a3214378 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
@@ -15,9 +15,9 @@
<AlertDialogPrimitive.Portal {...portalProps}>
<AlertDialogOverlay />
+
<AlertDialogPrimitive.Content
bind:ref
- data-slot="alert-dialog-content"
class={cn(
'fixed z-[999999] grid w-full gap-4 border bg-background p-6 shadow-lg duration-200',
// Mobile: Bottom sheet behavior
@@ -30,6 +30,7 @@
'sm:data-[state=open]:slide-in-from-bottom-0 sm:data-[state=open]:zoom-in-95',
className
)}
+ data-slot="alert-dialog-content"
{...restProps}
/>
</AlertDialogPrimitive.Portal>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
index 9b0906a756..5bd7800c48 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
@@ -11,7 +11,7 @@
<AlertDialogPrimitive.Description
bind:ref
- data-slot="alert-dialog-description"
class={cn('text-sm text-muted-foreground', className)}
+ data-slot="alert-dialog-description"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
index 38894b03d3..c4e9dda551 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="alert-dialog-footer"
class={cn(
'mt-6 flex flex-row gap-2 sm:mt-0 sm:justify-end [&>*]:flex-1 sm:[&>*]:flex-none',
className
)}
+ data-slot="alert-dialog-footer"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
index 030bc15724..b75e53a33c 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="alert-dialog-header"
class={cn('flex flex-col gap-2 text-center sm:text-left', className)}
+ data-slot="alert-dialog-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
index 6a648b7971..418c643a2c 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
@@ -11,10 +11,10 @@
<AlertDialogPrimitive.Overlay
bind:ref
- data-slot="alert-dialog-overlay"
class={cn(
'fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=open]:animate-in data-[state=open]:fade-in-0',
className
)}
+ data-slot="alert-dialog-overlay"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
index c882a4aa28..1bf3a22b4d 100644
--- a/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
+++ b/tools/ui/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
@@ -11,7 +11,7 @@
<AlertDialogPrimitive.Title
bind:ref
- data-slot="alert-dialog-title"
class={cn('text-lg font-semibold', className)}
+ data-slot="alert-dialog-title"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/alert/alert-description.svelte b/tools/ui/src/lib/components/ui/alert/alert-description.svelte
index 8d87d2d8fe..f812e9419c 100644
--- a/tools/ui/src/lib/components/ui/alert/alert-description.svelte
+++ b/tools/ui/src/lib/components/ui/alert/alert-description.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="alert-description"
class={cn(
'col-start-2 grid justify-items-start gap-1 text-sm text-muted-foreground [&_p]:leading-relaxed',
className
)}
+ data-slot="alert-description"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/alert/alert-title.svelte b/tools/ui/src/lib/components/ui/alert/alert-title.svelte
index 1cdb7958ac..823238dd02 100644
--- a/tools/ui/src/lib/components/ui/alert/alert-title.svelte
+++ b/tools/ui/src/lib/components/ui/alert/alert-title.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="alert-title"
class={cn('col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight', className)}
+ data-slot="alert-title"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/alert/alert.svelte b/tools/ui/src/lib/components/ui/alert/alert.svelte
index c42000a54e..0078e30b54 100644
--- a/tools/ui/src/lib/components/ui/alert/alert.svelte
+++ b/tools/ui/src/lib/components/ui/alert/alert.svelte
@@ -35,8 +35,8 @@
<div
bind:this={ref}
- data-slot="alert"
class={cn(alertVariants({ variant }), className)}
+ data-slot="alert"
{...restProps}
role="alert"
>
diff --git a/tools/ui/src/lib/components/ui/badge/badge.svelte b/tools/ui/src/lib/components/ui/badge/badge.svelte
index 0be4deae81..3210d25efc 100644
--- a/tools/ui/src/lib/components/ui/badge/badge.svelte
+++ b/tools/ui/src/lib/components/ui/badge/badge.svelte
@@ -42,9 +42,9 @@
<svelte:element
this={href ? 'a' : 'span'}
bind:this={ref}
+ class={cn(badgeVariants({ variant }), className, 'backdrop-blur-sm')}
data-slot="badge"
{href}
- class={cn(badgeVariants({ variant }), className, 'backdrop-blur-sm')}
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/button/button.svelte b/tools/ui/src/lib/components/ui/button/button.svelte
index 3f39b651e8..8d89f1b952 100644
--- a/tools/ui/src/lib/components/ui/button/button.svelte
+++ b/tools/ui/src/lib/components/ui/button/button.svelte
@@ -59,10 +59,10 @@
{#if href}
<a
bind:this={ref}
- data-slot="button"
+ aria-disabled={disabled}
class={cn(buttonVariants({ size, variant }), className)}
+ data-slot="button"
href={disabled ? undefined : href}
- aria-disabled={disabled}
role={disabled ? 'link' : undefined}
tabindex={disabled ? -1 : undefined}
{...restProps}
@@ -72,10 +72,10 @@
{:else}
<button
bind:this={ref}
- data-slot="button"
class={cn(buttonVariants({ size, variant }), className)}
- {type}
+ data-slot="button"
{disabled}
+ {type}
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card-action.svelte b/tools/ui/src/lib/components/ui/card/card-action.svelte
index 19baee33d2..46abf91b94 100644
--- a/tools/ui/src/lib/components/ui/card/card-action.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-action.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="card-action"
class={cn('col-start-2 row-span-2 row-start-1 self-start justify-self-end', className)}
+ data-slot="card-action"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card-content.svelte b/tools/ui/src/lib/components/ui/card/card-content.svelte
index 230d6decda..728f27f37a 100644
--- a/tools/ui/src/lib/components/ui/card/card-content.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-content.svelte
@@ -10,6 +10,6 @@
}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
</script>
-<div bind:this={ref} data-slot="card-content" class={cn('px-6', className)} {...restProps}>
+<div bind:this={ref} class={cn('px-6', className)} data-slot="card-content" {...restProps}>
{@render children?.()}
</div>
diff --git a/tools/ui/src/lib/components/ui/card/card-description.svelte b/tools/ui/src/lib/components/ui/card/card-description.svelte
index d4c588875f..e75f810d5c 100644
--- a/tools/ui/src/lib/components/ui/card/card-description.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-description.svelte
@@ -12,8 +12,8 @@
<p
bind:this={ref}
- data-slot="card-description"
class={cn('text-sm text-muted-foreground', className)}
+ data-slot="card-description"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card-footer.svelte b/tools/ui/src/lib/components/ui/card/card-footer.svelte
index 53151b3849..55c153d8c9 100644
--- a/tools/ui/src/lib/components/ui/card/card-footer.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-footer.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="card-footer"
class={cn('flex items-center px-6 [.border-t]:pt-6', className)}
+ data-slot="card-footer"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card-header.svelte b/tools/ui/src/lib/components/ui/card/card-header.svelte
index 0c9db040dc..ca2ac98b1b 100644
--- a/tools/ui/src/lib/components/ui/card/card-header.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-header.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="card-header"
class={cn(
'@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6',
className
)}
+ data-slot="card-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card-title.svelte b/tools/ui/src/lib/components/ui/card/card-title.svelte
index a60b4f936b..a4323a67f4 100644
--- a/tools/ui/src/lib/components/ui/card/card-title.svelte
+++ b/tools/ui/src/lib/components/ui/card/card-title.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="card-title"
class={cn('leading-none font-semibold', className)}
+ data-slot="card-title"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/card/card.svelte b/tools/ui/src/lib/components/ui/card/card.svelte
index 1df9f113be..3dda1579ac 100644
--- a/tools/ui/src/lib/components/ui/card/card.svelte
+++ b/tools/ui/src/lib/components/ui/card/card.svelte
@@ -13,12 +13,12 @@
<div
bind:this={ref}
- data-slot="card"
class={cn(
'flex flex-col gap-6 rounded-xl bg-card py-6 text-card-foreground shadow-sm',
BOX_BORDER,
className
)}
+ data-slot="card"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte b/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
index 8e2a4b5e7e..ec6d28826e 100644
--- a/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
+++ b/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
@@ -14,18 +14,18 @@
</script>
<CheckboxPrimitive.Root
+ bind:checked
+ bind:indeterminate
bind:ref
- data-slot="checkbox"
class={cn(
'peer flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-input bg-background shadow-xs transition-shadow outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[state=checked]:border-primary data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:bg-input/30 dark:aria-invalid:ring-destructive/40 dark:data-[state=checked]:bg-primary',
className
)}
- bind:checked
- bind:indeterminate
+ data-slot="checkbox"
{...restProps}
>
{#snippet children({ checked, indeterminate })}
- <div data-slot="checkbox-indicator" class="text-current transition-none">
+ <div class="text-current transition-none" data-slot="checkbox-indicator">
{#if checked}
<CheckIcon class="size-3.5" />
{:else if indeterminate}
diff --git a/tools/ui/src/lib/components/ui/collapsible/collapsible.svelte b/tools/ui/src/lib/components/ui/collapsible/collapsible.svelte
index 68f56dfc54..d911fa2efd 100644
--- a/tools/ui/src/lib/components/ui/collapsible/collapsible.svelte
+++ b/tools/ui/src/lib/components/ui/collapsible/collapsible.svelte
@@ -8,4 +8,4 @@
}: CollapsiblePrimitive.RootProps = $props();
</script>
-<CollapsiblePrimitive.Root bind:ref bind:open data-slot="collapsible" {...restProps} />
+<CollapsiblePrimitive.Root bind:open bind:ref data-slot="collapsible" {...restProps} />
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-content.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-content.svelte
index 3063795ce7..e6b2a641d5 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-content.svelte
@@ -21,21 +21,24 @@
<Dialog.Portal {...portalProps}>
<Dialog.Overlay />
+
<DialogPrimitive.Content
bind:ref
- data-slot="dialog-content"
class={cn(
`fixed top-[50%] left-[50%] z-50 grid max-h-[100dvh] w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto rounded-lg border border-border/30 bg-background p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95 sm:max-w-lg md:max-h-[100vh]`,
className
)}
+ data-slot="dialog-content"
{...restProps}
>
{@render children?.()}
+
{#if showCloseButton}
<DialogPrimitive.Close
class="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
>
<XIcon />
+
<span class="sr-only">Close</span>
</DialogPrimitive.Close>
{/if}
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-description.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-description.svelte
index 97873cfee3..b7f2fc3a98 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-description.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-description.svelte
@@ -11,7 +11,7 @@
<DialogPrimitive.Description
bind:ref
- data-slot="dialog-description"
class={cn('text-sm text-muted-foreground', className)}
+ data-slot="dialog-description"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-footer.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-footer.svelte
index 6e1926b93d..0151869682 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-footer.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-footer.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="dialog-footer"
class={cn('flex flex-col-reverse gap-2 sm:flex-row sm:justify-end', className)}
+ data-slot="dialog-footer"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-header.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-header.svelte
index 5c6a1aee74..f562694145 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-header.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-header.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="dialog-header"
class={cn('flex flex-col gap-2 text-center sm:text-left', className)}
+ data-slot="dialog-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-overlay.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-overlay.svelte
index bd6fb3fc20..bb9a514c9d 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-overlay.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-overlay.svelte
@@ -11,10 +11,10 @@
<DialogPrimitive.Overlay
bind:ref
- data-slot="dialog-overlay"
class={cn(
'fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=open]:animate-in data-[state=open]:fade-in-0',
className
)}
+ data-slot="dialog-overlay"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dialog/dialog-title.svelte b/tools/ui/src/lib/components/ui/dialog/dialog-title.svelte
index 68d6522e4f..c2ad8b6e8c 100644
--- a/tools/ui/src/lib/components/ui/dialog/dialog-title.svelte
+++ b/tools/ui/src/lib/components/ui/dialog/dialog-title.svelte
@@ -11,7 +11,7 @@
<DialogPrimitive.Title
bind:ref
- data-slot="dialog-title"
class={cn('text-lg leading-none font-semibold', className)}
+ data-slot="dialog-title"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
index 142a5e1a62..9d681e00ea 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -18,14 +18,14 @@
</script>
<DropdownMenuPrimitive.CheckboxItem
- bind:ref
bind:checked
bind:indeterminate
- data-slot="dropdown-menu-checkbox-item"
+ bind:ref
class={cn(
"relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className
)}
+ data-slot="dropdown-menu-checkbox-item"
{...restProps}
>
{#snippet children({ checked, indeterminate })}
@@ -36,6 +36,7 @@
<CheckIcon class={cn('size-4', !checked && 'text-transparent')} />
{/if}
</span>
+
{@render childrenProp?.()}
{/snippet}
</DropdownMenuPrimitive.CheckboxItem>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
index af34ad6aa5..014e85b58b 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
@@ -16,12 +16,12 @@
<DropdownMenuPrimitive.Portal {...portalProps}>
<DropdownMenuPrimitive.Content
bind:ref
- data-slot="dropdown-menu-content"
- {sideOffset}
class={cn(
'z-50 max-h-(--bits-dropdown-menu-content-available-height) min-w-[8rem] origin-(--bits-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border border-border bg-popover p-1.5 text-popover-foreground shadow-md outline-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95 dark:border-border/20',
className
)}
+ data-slot="dropdown-menu-content"
+ {sideOffset}
{...restProps}
/>
</DropdownMenuPrimitive.Portal>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
index 3b98c11fe7..d8a9fc2ec8 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
@@ -15,8 +15,8 @@
<DropdownMenuPrimitive.GroupHeading
bind:ref
- data-slot="dropdown-menu-group-heading"
- data-inset={inset}
class={cn('px-2 py-1.5 text-sm font-semibold data-[inset]:pl-8', className)}
+ data-inset={inset}
+ data-slot="dropdown-menu-group-heading"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
index 82e19def57..b43a431f34 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
@@ -16,12 +16,12 @@
<DropdownMenuPrimitive.Item
bind:ref
- data-slot="dropdown-menu-item"
- data-inset={inset}
- data-variant={variant}
class={cn(
"relative flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 data-[variant=destructive]:text-destructive data-[variant=destructive]:data-highlighted:bg-destructive/10 data-[variant=destructive]:data-highlighted:text-destructive dark:data-[variant=destructive]:data-highlighted:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:*:[svg]:!text-destructive",
className
)}
+ data-inset={inset}
+ data-slot="dropdown-menu-item"
+ data-variant={variant}
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
index 36166cd79c..cd574f27d0 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
@@ -15,9 +15,9 @@
<div
bind:this={ref}
- data-slot="dropdown-menu-label"
- data-inset={inset}
class={cn('px-2 py-1.5 text-sm font-semibold data-[inset]:pl-8', className)}
+ data-inset={inset}
+ data-slot="dropdown-menu-label"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
index 077bd09413..a3b4300119 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
@@ -13,11 +13,11 @@
<DropdownMenuPrimitive.RadioItem
bind:ref
- data-slot="dropdown-menu-radio-item"
class={cn(
"relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className
)}
+ data-slot="dropdown-menu-radio-item"
{...restProps}
>
{#snippet children({ checked })}
@@ -26,6 +26,7 @@
<CircleIcon class="size-2 fill-current" />
{/if}
</span>
+
{@render childrenProp?.({ checked })}
{/snippet}
</DropdownMenuPrimitive.RadioItem>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
index b2da42ae76..5ca7782867 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
@@ -11,7 +11,7 @@
<DropdownMenuPrimitive.Separator
bind:ref
- data-slot="dropdown-menu-separator"
class={cn('-mx-1 my-1 h-px bg-border/20', className)}
+ data-slot="dropdown-menu-separator"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
index 72ff18fb31..20d75e21d7 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
@@ -12,8 +12,8 @@
<span
bind:this={ref}
- data-slot="dropdown-menu-shortcut"
class={cn('ml-auto text-xs tracking-widest text-muted-foreground', className)}
+ data-slot="dropdown-menu-shortcut"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
index 6760a84927..28c99086fd 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
@@ -11,10 +11,10 @@
<DropdownMenuPrimitive.SubContent
bind:ref
- data-slot="dropdown-menu-sub-content"
class={cn(
'z-50 max-h-(--bits-dropdown-menu-content-available-height) min-w-[8rem] origin-(--bits-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border border-border bg-popover p-1.5 text-popover-foreground shadow-md outline-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95 dark:border-border/20',
className
)}
+ data-slot="dropdown-menu-sub-content"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
index 8e07ce1fb5..d7eb475def 100644
--- a/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
+++ b/tools/ui/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
@@ -16,14 +16,15 @@
<DropdownMenuPrimitive.SubTrigger
bind:ref
- data-slot="dropdown-menu-sub-trigger"
- data-inset={inset}
class={cn(
"flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 data-[state=open]:bg-accent data-[state=open]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",
className
)}
+ data-inset={inset}
+ data-slot="dropdown-menu-sub-trigger"
{...restProps}
>
{@render children?.()}
+
<ChevronRightIcon class="ml-auto size-4" />
</DropdownMenuPrimitive.SubTrigger>
diff --git a/tools/ui/src/lib/components/ui/empty/empty-content.svelte b/tools/ui/src/lib/components/ui/empty/empty-content.svelte
index d763e85dba..d902111dab 100644
--- a/tools/ui/src/lib/components/ui/empty/empty-content.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty-content.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="empty-content"
class={cn(
'gap-2.5 text-sm flex w-full max-w-sm min-w-0 flex-col items-center text-balance',
className
)}
+ data-slot="empty-content"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/empty/empty-description.svelte b/tools/ui/src/lib/components/ui/empty/empty-description.svelte
index 42c0cdf3d1..e0119da89f 100644
--- a/tools/ui/src/lib/components/ui/empty/empty-description.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty-description.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="empty-description"
class={cn(
'text-sm/relaxed text-muted-foreground [&>a:hover]:text-primary text-sm/relaxed [&>a]:underline [&>a]:underline-offset-4',
className
)}
+ data-slot="empty-description"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/empty/empty-header.svelte b/tools/ui/src/lib/components/ui/empty/empty-header.svelte
index 1636467f09..72b3b75215 100644
--- a/tools/ui/src/lib/components/ui/empty/empty-header.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty-header.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="empty-header"
class={cn('gap-2 flex max-w-sm flex-col items-center', className)}
+ data-slot="empty-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/empty/empty-media.svelte b/tools/ui/src/lib/components/ui/empty/empty-media.svelte
index 8ca69f0608..f449da4f3d 100644
--- a/tools/ui/src/lib/components/ui/empty/empty-media.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty-media.svelte
@@ -32,9 +32,9 @@
<div
bind:this={ref}
+ class={cn(emptyMediaVariants({ variant }), className)}
data-slot="empty-icon"
data-variant={variant}
- class={cn(emptyMediaVariants({ variant }), className)}
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/empty/empty-title.svelte b/tools/ui/src/lib/components/ui/empty/empty-title.svelte
index 37d2701b1b..d2c2af947a 100644
--- a/tools/ui/src/lib/components/ui/empty/empty-title.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty-title.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="empty-title"
class={cn('text-sm font-medium tracking-tight', className)}
+ data-slot="empty-title"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/empty/empty.svelte b/tools/ui/src/lib/components/ui/empty/empty.svelte
index 3585588504..1625df1783 100644
--- a/tools/ui/src/lib/components/ui/empty/empty.svelte
+++ b/tools/ui/src/lib/components/ui/empty/empty.svelte
@@ -12,11 +12,11 @@
<div
bind:this={ref}
- data-slot="empty"
class={cn(
'gap-4 rounded-xl border-dashed p-6 flex w-full min-w-0 flex-1 flex-col items-center justify-center text-center text-balance',
className
)}
+ data-slot="empty"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/hover-card/hover-card-content.svelte b/tools/ui/src/lib/components/ui/hover-card/hover-card-content.svelte
index 1355ae401a..cf1d1b8068 100644
--- a/tools/ui/src/lib/components/ui/hover-card/hover-card-content.svelte
+++ b/tools/ui/src/lib/components/ui/hover-card/hover-card-content.svelte
@@ -19,13 +19,13 @@
<HoverCardPortal {...portalProps}>
<HoverCardPrimitive.Content
bind:ref
- data-slot="hover-card-content"
{align}
- {sideOffset}
class={cn(
'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 bg-popover text-popover-foreground w-64 rounded-lg p-2.5 text-sm shadow-md ring-1 duration-100 z-50 origin-(--transform-origin) outline-hidden',
className
)}
+ data-slot="hover-card-content"
+ {sideOffset}
{...restProps}
/>
</HoverCardPortal>
diff --git a/tools/ui/src/lib/components/ui/input/input.svelte b/tools/ui/src/lib/components/ui/input/input.svelte
index 87e71b196b..c5718e4d0d 100644
--- a/tools/ui/src/lib/components/ui/input/input.svelte
+++ b/tools/ui/src/lib/components/ui/input/input.svelte
@@ -21,32 +21,32 @@
{#if type === 'file'}
<input
+ bind:files
bind:this={ref}
- data-slot="input"
+ bind:value
class={cn(
'flex h-9 w-full min-w-0 rounded-md border border-input bg-transparent px-3 pt-1.5 text-sm font-medium shadow-xs ring-offset-background transition-[color,box-shadow] outline-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:bg-input/30',
'focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50',
'aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40',
className
)}
+ data-slot="input"
type="file"
- bind:files
- bind:value
{...restProps}
/>
{:else}
<input
bind:this={ref}
- data-slot="input"
+ bind:value
class={cn(
'flex h-9 w-full min-w-0 rounded-md border border-input bg-background px-3 py-1 text-base shadow-xs ring-offset-background transition-[color,box-shadow] outline-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:bg-input/30',
'focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50',
'aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40',
className
)}
+ data-slot="input"
style="backdrop-filter: blur(0.5rem);"
{type}
- bind:value
{...restProps}
/>
{/if}
diff --git a/tools/ui/src/lib/components/ui/label/label.svelte b/tools/ui/src/lib/components/ui/label/label.svelte
index aab94043e7..61456f0642 100644
--- a/tools/ui/src/lib/components/ui/label/label.svelte
+++ b/tools/ui/src/lib/components/ui/label/label.svelte
@@ -11,10 +11,10 @@
<LabelPrimitive.Root
bind:ref
- data-slot="label"
class={cn(
'flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
className
)}
+ data-slot="label"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/popover/popover-content.svelte b/tools/ui/src/lib/components/ui/popover/popover-content.svelte
index 6ee27dde24..a3ed554208 100644
--- a/tools/ui/src/lib/components/ui/popover/popover-content.svelte
+++ b/tools/ui/src/lib/components/ui/popover/popover-content.svelte
@@ -22,16 +22,16 @@
<PopoverPortal {...portalProps}>
<PopoverPrimitive.Content
bind:ref
- data-slot="popover-content"
- {sideOffset}
- {side}
{align}
- {collisionPadding}
{avoidCollisions}
class={cn(
'z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-hidden data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
className
)}
+ {collisionPadding}
+ data-slot="popover-content"
+ {side}
+ {sideOffset}
{...restProps}
/>
</PopoverPortal>
diff --git a/tools/ui/src/lib/components/ui/popover/popover-trigger.svelte b/tools/ui/src/lib/components/ui/popover/popover-trigger.svelte
index 13624b56c9..bc07628927 100644
--- a/tools/ui/src/lib/components/ui/popover/popover-trigger.svelte
+++ b/tools/ui/src/lib/components/ui/popover/popover-trigger.svelte
@@ -11,7 +11,7 @@
<PopoverPrimitive.Trigger
bind:ref
- data-slot="popover-trigger"
class={cn('', className)}
+ data-slot="popover-trigger"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/radio-group/radio-group-item.svelte b/tools/ui/src/lib/components/ui/radio-group/radio-group-item.svelte
index a3d9ebdf0c..0dd846d516 100644
--- a/tools/ui/src/lib/components/ui/radio-group/radio-group-item.svelte
+++ b/tools/ui/src/lib/components/ui/radio-group/radio-group-item.svelte
@@ -12,15 +12,15 @@
<RadioGroupPrimitive.Item
bind:ref
- data-slot="radio-group-item"
class={cn(
'border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 dark:aria-invalid:border-destructive/50 flex size-4 rounded-full focus-visible:ring-3 aria-invalid:ring-3 group/radio-group-item peer relative aspect-square shrink-0 border outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50',
className
)}
+ data-slot="radio-group-item"
{...restProps}
>
{#snippet children({ checked })}
- <div data-slot="radio-group-indicator" class="flex size-4 items-center justify-center">
+ <div class="flex size-4 items-center justify-center" data-slot="radio-group-indicator">
{#if checked}
<CircleIcon
class="bg-primary-foreground absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full"
diff --git a/tools/ui/src/lib/components/ui/radio-group/radio-group.svelte b/tools/ui/src/lib/components/ui/radio-group/radio-group.svelte
index 77504486c4..41e20f572a 100644
--- a/tools/ui/src/lib/components/ui/radio-group/radio-group.svelte
+++ b/tools/ui/src/lib/components/ui/radio-group/radio-group.svelte
@@ -13,7 +13,7 @@
<RadioGroupPrimitive.Root
bind:ref
bind:value
- data-slot="radio-group"
class={cn('grid gap-2 w-full', className)}
+ data-slot="radio-group"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte b/tools/ui/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
index f0085804f6..606e770e3b 100644
--- a/tools/ui/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
+++ b/tools/ui/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
@@ -13,19 +13,20 @@
<ScrollAreaPrimitive.Scrollbar
bind:ref
- data-slot="scroll-area-scrollbar"
- {orientation}
class={cn(
'flex touch-none p-px transition-colors select-none',
orientation === 'vertical' && 'h-full w-2.5 border-l border-l-transparent',
orientation === 'horizontal' && 'h-2.5 flex-col border-t border-t-transparent',
className
)}
+ data-slot="scroll-area-scrollbar"
+ {orientation}
{...restProps}
>
{@render children?.()}
+
<ScrollAreaPrimitive.Thumb
- data-slot="scroll-area-thumb"
class="relative flex-1 rounded-full bg-border"
+ data-slot="scroll-area-thumb"
/>
</ScrollAreaPrimitive.Scrollbar>
diff --git a/tools/ui/src/lib/components/ui/scroll-area/scroll-area.svelte b/tools/ui/src/lib/components/ui/scroll-area/scroll-area.svelte
index d881913c2e..2395662f84 100644
--- a/tools/ui/src/lib/components/ui/scroll-area/scroll-area.svelte
+++ b/tools/ui/src/lib/components/ui/scroll-area/scroll-area.svelte
@@ -20,21 +20,24 @@
<ScrollAreaPrimitive.Root
bind:ref
- data-slot="scroll-area"
class={cn('relative', className)}
+ data-slot="scroll-area"
{...restProps}
>
<ScrollAreaPrimitive.Viewport
- data-slot="scroll-area-viewport"
class="size-full rounded-[inherit] ring-ring/10 outline-ring/50 transition-[color,box-shadow] focus-visible:ring-4 focus-visible:outline-1 dark:ring-ring/20 dark:outline-ring/40"
+ data-slot="scroll-area-viewport"
>
{@render children?.()}
</ScrollAreaPrimitive.Viewport>
+
{#if orientation === 'vertical' || orientation === 'both'}
- <Scrollbar orientation="vertical" class={scrollbarYClasses} />
+ <Scrollbar class={scrollbarYClasses} orientation="vertical" />
{/if}
+
{#if orientation === 'horizontal' || orientation === 'both'}
- <Scrollbar orientation="horizontal" class={scrollbarXClasses} />
+ <Scrollbar class={scrollbarXClasses} orientation="horizontal" />
{/if}
+
<ScrollAreaPrimitive.Corner />
</ScrollAreaPrimitive.Root>
diff --git a/tools/ui/src/lib/components/ui/select/select-content.svelte b/tools/ui/src/lib/components/ui/select/select-content.svelte
index cd64675972..f8792f8a9d 100644
--- a/tools/ui/src/lib/components/ui/select/select-content.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-content.svelte
@@ -87,15 +87,16 @@
<SelectPrimitive.Portal {...portalProps}>
<SelectPrimitive.Content
bind:ref
- {sideOffset}
- data-slot="select-content"
class={cn(
'relative z-[var(--layer-popover,1000000)] max-h-(--bits-select-content-available-height) min-w-[8rem] origin-(--bits-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover text-popover-foreground shadow-md data-[side=bottom]:translate-y-1 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:-translate-x-1 data-[side=left]:slide-in-from-right-2 data-[side=right]:translate-x-1 data-[side=right]:slide-in-from-left-2 data-[side=top]:-translate-y-1 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
className
)}
+ data-slot="select-content"
+ {sideOffset}
{...restProps}
>
<SelectScrollUpButton />
+
<SelectPrimitive.Viewport
class={cn(
'h-(--bits-select-anchor-height) w-full min-w-(--bits-select-anchor-width) scroll-my-1 p-1'
@@ -103,6 +104,7 @@
>
{@render children?.()}
</SelectPrimitive.Viewport>
+
<SelectScrollDownButton />
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
diff --git a/tools/ui/src/lib/components/ui/select/select-group-heading.svelte b/tools/ui/src/lib/components/ui/select/select-group-heading.svelte
index fc7dcd6d6e..e6c1a22547 100644
--- a/tools/ui/src/lib/components/ui/select/select-group-heading.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-group-heading.svelte
@@ -13,8 +13,8 @@
<SelectPrimitive.GroupHeading
bind:ref
- data-slot="select-group-heading"
class={cn('px-2 py-1.5 text-xs text-muted-foreground', className)}
+ data-slot="select-group-heading"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/select/select-item.svelte b/tools/ui/src/lib/components/ui/select/select-item.svelte
index 72e112d78f..cfdfeab4ee 100644
--- a/tools/ui/src/lib/components/ui/select/select-item.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-item.svelte
@@ -15,12 +15,12 @@
<SelectPrimitive.Item
bind:ref
- {value}
- data-slot="select-item"
class={cn(
"relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
className
)}
+ data-slot="select-item"
+ {value}
{...restProps}
>
{#snippet children({ highlighted, selected })}
@@ -29,6 +29,7 @@
<CheckIcon class="size-4" />
{/if}
</span>
+
{#if childrenProp}
{@render childrenProp({ highlighted, selected })}
{:else}
diff --git a/tools/ui/src/lib/components/ui/select/select-label.svelte b/tools/ui/src/lib/components/ui/select/select-label.svelte
index 2eebf41362..a23674f918 100644
--- a/tools/ui/src/lib/components/ui/select/select-label.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-label.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="select-label"
class={cn('px-2 py-1.5 text-xs text-muted-foreground', className)}
+ data-slot="select-label"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/select/select-scroll-down-button.svelte b/tools/ui/src/lib/components/ui/select/select-scroll-down-button.svelte
index c4d629b0a5..a8aa1a8e0c 100644
--- a/tools/ui/src/lib/components/ui/select/select-scroll-down-button.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-scroll-down-button.svelte
@@ -12,8 +12,8 @@
<SelectPrimitive.ScrollDownButton
bind:ref
- data-slot="select-scroll-down-button"
class={cn('flex cursor-default items-center justify-center py-1', className)}
+ data-slot="select-scroll-down-button"
{...restProps}
>
<ChevronDownIcon class="size-4" />
diff --git a/tools/ui/src/lib/components/ui/select/select-scroll-up-button.svelte b/tools/ui/src/lib/components/ui/select/select-scroll-up-button.svelte
index f267bf612e..7c765f447a 100644
--- a/tools/ui/src/lib/components/ui/select/select-scroll-up-button.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-scroll-up-button.svelte
@@ -12,8 +12,8 @@
<SelectPrimitive.ScrollUpButton
bind:ref
- data-slot="select-scroll-up-button"
class={cn('flex cursor-default items-center justify-center py-1', className)}
+ data-slot="select-scroll-up-button"
{...restProps}
>
<ChevronUpIcon class="size-4" />
diff --git a/tools/ui/src/lib/components/ui/select/select-separator.svelte b/tools/ui/src/lib/components/ui/select/select-separator.svelte
index d627076038..c8a13d57e5 100644
--- a/tools/ui/src/lib/components/ui/select/select-separator.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-separator.svelte
@@ -12,7 +12,7 @@
<Separator
bind:ref
- data-slot="select-separator"
class={cn('pointer-events-none -mx-1 my-1 h-px bg-border', className)}
+ data-slot="select-separator"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/select/select-trigger.svelte b/tools/ui/src/lib/components/ui/select/select-trigger.svelte
index 6bd8e52d9b..9f642819ec 100644
--- a/tools/ui/src/lib/components/ui/select/select-trigger.svelte
+++ b/tools/ui/src/lib/components/ui/select/select-trigger.svelte
@@ -30,11 +30,12 @@
<SelectPrimitive.Trigger
bind:ref
- data-slot="select-trigger"
- data-size={size}
class={cn(baseClasses, className)}
+ data-size={size}
+ data-slot="select-trigger"
{...restProps}
>
{@render children?.()}
+
<ChevronDownIcon class={chevronClasses} />
</SelectPrimitive.Trigger>
diff --git a/tools/ui/src/lib/components/ui/separator/separator.svelte b/tools/ui/src/lib/components/ui/separator/separator.svelte
index 343770f5be..80ab3e52a4 100644
--- a/tools/ui/src/lib/components/ui/separator/separator.svelte
+++ b/tools/ui/src/lib/components/ui/separator/separator.svelte
@@ -11,10 +11,10 @@
<SeparatorPrimitive.Root
bind:ref
- data-slot="separator"
class={cn(
'shrink-0 bg-border data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px',
className
)}
+ data-slot="separator"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-content.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-content.svelte
index 292fe0e210..ddb2ddd079 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-content.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-content.svelte
@@ -44,17 +44,20 @@
<SheetPrimitive.Portal {...portalProps}>
<SheetOverlay />
+
<SheetPrimitive.Content
bind:ref
- data-slot="sheet-content"
class={cn(sheetVariants({ side }), className)}
+ data-slot="sheet-content"
{...restProps}
>
{@render children?.()}
+
<SheetPrimitive.Close
class="absolute top-4 right-4 rounded-xs opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-hidden disabled:pointer-events-none"
>
<XIcon class="size-4" />
+
<span class="sr-only">Close</span>
</SheetPrimitive.Close>
</SheetPrimitive.Content>
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-description.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-description.svelte
index a39ea3d045..44e188c87c 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-description.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-description.svelte
@@ -11,7 +11,7 @@
<SheetPrimitive.Description
bind:ref
- data-slot="sheet-description"
class={cn('text-sm text-muted-foreground', className)}
+ data-slot="sheet-description"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-footer.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-footer.svelte
index 420a8fdd7d..0ce246ebb1 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-footer.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-footer.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="sheet-footer"
class={cn('mt-auto flex flex-col gap-2 p-4', className)}
+ data-slot="sheet-footer"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-header.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-header.svelte
index 3f3dd3c2c1..86c4f17c36 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-header.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-header.svelte
@@ -12,8 +12,8 @@
<div
bind:this={ref}
- data-slot="sheet-header"
class={cn('flex flex-col gap-1.5 p-4', className)}
+ data-slot="sheet-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-overlay.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-overlay.svelte
index ddfae7592f..fde98e97c8 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-overlay.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-overlay.svelte
@@ -11,10 +11,10 @@
<SheetPrimitive.Overlay
bind:ref
- data-slot="sheet-overlay"
class={cn(
'fixed inset-0 z-50 bg-black/50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:fill-mode-forwards data-[state=open]:animate-in data-[state=open]:fade-in-0',
className
)}
+ data-slot="sheet-overlay"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/sheet/sheet-title.svelte b/tools/ui/src/lib/components/ui/sheet/sheet-title.svelte
index 38feaad8ff..a2ac4041c4 100644
--- a/tools/ui/src/lib/components/ui/sheet/sheet-title.svelte
+++ b/tools/ui/src/lib/components/ui/sheet/sheet-title.svelte
@@ -11,7 +11,7 @@
<SheetPrimitive.Title
bind:ref
- data-slot="sheet-title"
class={cn('font-semibold text-foreground', className)}
+ data-slot="sheet-title"
{...restProps}
/>
diff --git a/tools/ui/src/lib/components/ui/skeleton/skeleton.svelte b/tools/ui/src/lib/components/ui/skeleton/skeleton.svelte
index 46d38a3d54..232606e008 100644
--- a/tools/ui/src/lib/components/ui/skeleton/skeleton.svelte
+++ b/tools/ui/src/lib/components/ui/skeleton/skeleton.svelte
@@ -11,7 +11,7 @@
<div
bind:this={ref}
- data-slot="skeleton"
class={cn('animate-pulse rounded-md bg-accent', className)}
+ data-slot="skeleton"
{...restProps}
></div>
diff --git a/tools/ui/src/lib/components/ui/switch/switch.svelte b/tools/ui/src/lib/components/ui/switch/switch.svelte
index 9d9698f7d9..0be9e41940 100644
--- a/tools/ui/src/lib/components/ui/switch/switch.svelte
+++ b/tools/ui/src/lib/components/ui/switch/switch.svelte
@@ -11,19 +11,19 @@
</script>
<SwitchPrimitive.Root
- bind:ref
bind:checked
- data-slot="switch"
+ bind:ref
class={cn(
'peer inline-flex h-[1.15rem] w-8 shrink-0 cursor-pointer items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input dark:data-[state=unchecked]:bg-input/80',
className
)}
+ data-slot="switch"
{...restProps}
>
<SwitchPrimitive.Thumb
- data-slot="switch-thumb"
class={cn(
'pointer-events-none block size-4 rounded-full bg-background ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0 dark:data-[state=checked]:bg-primary-foreground dark:data-[state=unchecked]:bg-foreground'
)}
+ data-slot="switch-thumb"
/>
</SwitchPrimitive.Root>
diff --git a/tools/ui/src/lib/components/ui/table/table-body.svelte b/tools/ui/src/lib/components/ui/table/table-body.svelte
index 7b16bc7a0a..07d8a8b6e0 100644
--- a/tools/ui/src/lib/components/ui/table/table-body.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-body.svelte
@@ -12,8 +12,8 @@
<tbody
bind:this={ref}
- data-slot="table-body"
class={cn('[&_tr:last-child]:border-0', className)}
+ data-slot="table-body"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-caption.svelte b/tools/ui/src/lib/components/ui/table/table-caption.svelte
index f10282f9b1..e1a867d942 100644
--- a/tools/ui/src/lib/components/ui/table/table-caption.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-caption.svelte
@@ -12,8 +12,8 @@
<caption
bind:this={ref}
- data-slot="table-caption"
class={cn('mt-4 text-sm text-muted-foreground', className)}
+ data-slot="table-caption"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-cell.svelte b/tools/ui/src/lib/components/ui/table/table-cell.svelte
index 5c90e223ba..429f9b7b00 100644
--- a/tools/ui/src/lib/components/ui/table/table-cell.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-cell.svelte
@@ -12,11 +12,11 @@
<td
bind:this={ref}
- data-slot="table-cell"
class={cn(
'bg-clip-padding p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pe-0',
className
)}
+ data-slot="table-cell"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-footer.svelte b/tools/ui/src/lib/components/ui/table/table-footer.svelte
index 880a5297a7..304d0b61e2 100644
--- a/tools/ui/src/lib/components/ui/table/table-footer.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-footer.svelte
@@ -12,8 +12,8 @@
<tfoot
bind:this={ref}
- data-slot="table-footer"
class={cn('border-t bg-muted/50 font-medium [&>tr]:last:border-b-0', className)}
+ data-slot="table-footer"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-head.svelte b/tools/ui/src/lib/components/ui/table/table-head.svelte
index 1740812360..9b8248fbf5 100644
--- a/tools/ui/src/lib/components/ui/table/table-head.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-head.svelte
@@ -12,11 +12,11 @@
<th
bind:this={ref}
- data-slot="table-head"
class={cn(
'h-10 bg-clip-padding px-2 text-left align-middle font-medium whitespace-nowrap text-foreground [&:has([role=checkbox])]:pe-0',
className
)}
+ data-slot="table-head"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-header.svelte b/tools/ui/src/lib/components/ui/table/table-header.svelte
index 3ffbb563eb..f47b453fa9 100644
--- a/tools/ui/src/lib/components/ui/table/table-header.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-header.svelte
@@ -12,8 +12,8 @@
<thead
bind:this={ref}
- data-slot="table-header"
class={cn('[&_tr]:border-b', className)}
+ data-slot="table-header"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table-row.svelte b/tools/ui/src/lib/components/ui/table/table-row.svelte
index 51b24b8e3f..31d4eea98b 100644
--- a/tools/ui/src/lib/components/ui/table/table-row.svelte
+++ b/tools/ui/src/lib/components/ui/table/table-row.svelte
@@ -12,11 +12,11 @@
<tr
bind:this={ref}
- data-slot="table-row"
class={cn(
'border-b transition-colors data-[state=selected]:bg-muted hover:[&,&>svelte-css-wrapper]:[&>th,td]:bg-muted/50',
className
)}
+ data-slot="table-row"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/table/table.svelte b/tools/ui/src/lib/components/ui/table/table.svelte
index 19f2644985..bc6e505e8e 100644
--- a/tools/ui/src/lib/components/ui/table/table.svelte
+++ b/tools/ui/src/lib/components/ui/table/table.svelte
@@ -10,11 +10,11 @@
}: WithElementRef<HTMLTableAttributes> = $props();
</script>
-<div data-slot="table-container" class="relative w-full overflow-x-auto">
+<div class="relative w-full overflow-x-auto" data-slot="table-container">
<table
bind:this={ref}
- data-slot="table"
class={cn('w-full caption-bottom text-sm', className)}
+ data-slot="table"
{...restProps}
>
{@render children?.()}
diff --git a/tools/ui/src/lib/components/ui/textarea/textarea.svelte b/tools/ui/src/lib/components/ui/textarea/textarea.svelte
index 346153ee50..7b0511dee7 100644
--- a/tools/ui/src/lib/components/ui/textarea/textarea.svelte
+++ b/tools/ui/src/lib/components/ui/textarea/textarea.svelte
@@ -12,11 +12,11 @@
<textarea
bind:this={ref}
- data-slot="textarea"
+ bind:value
class={cn(
'flex field-sizing-content min-h-16 w-full rounded-md border border-input bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 md:text-sm dark:bg-input/30 dark:aria-invalid:ring-destructive/40',
className
)}
- bind:value
+ data-slot="textarea"
{...restProps}
></textarea>
diff --git a/tools/ui/src/lib/components/ui/tooltip/tooltip-content.svelte b/tools/ui/src/lib/components/ui/tooltip/tooltip-content.svelte
index 19d90d6374..423fd1af33 100644
--- a/tools/ui/src/lib/components/ui/tooltip/tooltip-content.svelte
+++ b/tools/ui/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -27,13 +27,14 @@
{#snippet tooltipContent()}
<TooltipPrimitive.Content
bind:ref
+ class={contentClass}
data-slot="tooltip-content"
- {sideOffset}
{side}
- class={contentClass}
+ {sideOffset}
{...restProps}
>
{@render children?.()}
+
<TooltipPrimitive.Arrow>
{#snippet child({ props })}
<div
diff --git a/tools/ui/src/lib/components/ui/tooltip/tooltip-trigger.svelte b/tools/ui/src/lib/components/ui/tooltip/tooltip-trigger.svelte
index 671d6e2201..1b8a611a5e 100644
--- a/tools/ui/src/lib/components/ui/tooltip/tooltip-trigger.svelte
+++ b/tools/ui/src/lib/components/ui/tooltip/tooltip-trigger.svelte
@@ -6,7 +6,7 @@
<TooltipPrimitive.Trigger
bind:ref
- data-slot="tooltip-trigger"
class="cursor-pointer"
+ data-slot="tooltip-trigger"
{...restProps}
/>
diff --git a/tools/ui/src/routes/(chat)/+page.svelte b/tools/ui/src/routes/(chat)/+page.svelte
index 95a3e19470..08a6b11ad5 100644
--- a/tools/ui/src/routes/(chat)/+page.svelte
+++ b/tools/ui/src/routes/(chat)/+page.svelte
@@ -95,6 +95,6 @@
<DialogModelNotAvailable
bind:open={showModelNotAvailable}
- modelName={requestedModelName}
availableModels={availableModelNames}
+ modelName={requestedModelName}
/>
diff --git a/tools/ui/src/routes/(chat)/chat/[id]/+page.svelte b/tools/ui/src/routes/(chat)/chat/[id]/+page.svelte
index 2fcff6bf66..c4a9eca2ee 100644
--- a/tools/ui/src/routes/(chat)/chat/[id]/+page.svelte
+++ b/tools/ui/src/routes/(chat)/chat/[id]/+page.svelte
@@ -139,6 +139,6 @@
<DialogModelNotAvailable
bind:open={showModelNotAvailable}
- modelName={requestedModelName}
availableModels={availableModelNames}
+ modelName={requestedModelName}
/>
diff --git a/tools/ui/src/routes/+error.svelte b/tools/ui/src/routes/+error.svelte
index f167c8e77c..6ba527fa54 100644
--- a/tools/ui/src/routes/+error.svelte
+++ b/tools/ui/src/routes/+error.svelte
@@ -48,21 +48,24 @@
viewBox="0 0 24 24"
>
<path
+ d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16.5c-.77.833.192 2.5 1.732 2.5z"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
- d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16.5c-.77.833.192 2.5 1.732 2.5z"
/>
</svg>
</div>
+
<h1 class="mb-2 text-2xl font-bold">Error {status}</h1>
+
<p class="text-muted-foreground">
{error?.message || 'Something went wrong'}
</p>
</div>
+
<button
- onclick={() => goto(ROUTES.START)}
class="rounded-md bg-primary px-4 py-2 text-primary-foreground hover:bg-primary/90"
+ onclick={() => goto(ROUTES.START)}
>
Go Home
</button>
diff --git a/tools/ui/src/routes/+layout.svelte b/tools/ui/src/routes/+layout.svelte
index 16adfe3327..38b6562715 100644
--- a/tools/ui/src/routes/+layout.svelte
+++ b/tools/ui/src/routes/+layout.svelte
@@ -296,7 +296,7 @@
<svelte:head>
{#if pwaAssetsHead.themeColor}
- <meta name="theme-color" content={pwaAssetsHead.themeColor.content} />
+ <meta content={pwaAssetsHead.themeColor.content} name="theme-color" />
{/if}
{#if settingsStore.config.customCss}
@@ -310,7 +310,7 @@
<PwaMetaTags />
</svelte:head>
-<svelte:window onkeydown={handleKeydown} bind:innerHeight bind:innerWidth />
+<svelte:window bind:innerHeight bind:innerWidth onkeydown={handleKeydown} />
<svelte:document onvisibilitychange={handleVisibilityChange} />
<Tooltip.Provider delayDuration={TOOLTIP_DELAY_DURATION}>
@@ -342,8 +342,8 @@
{/if}
<PwaRefreshAlert
- needRefresh={$needRefresh || pwa.needRefreshByStorage}
forceReload={pwa.needRefreshByStorage}
+ needRefresh={$needRefresh || pwa.needRefreshByStorage}
{updateServiceWorker}
/>
</div>
diff --git a/tools/ui/src/routes/search/+page.svelte b/tools/ui/src/routes/search/+page.svelte
index 548b9911a6..5b68d267f3 100644
--- a/tools/ui/src/routes/search/+page.svelte
+++ b/tools/ui/src/routes/search/+page.svelte
@@ -77,9 +77,9 @@
<div class="fixed top-0 z-10 left-0 right-0 p-2">
<SearchInput
- autofocus
- bind:value={searchQuery}
bind:ref={searchInputRef}
+ bind:value={searchQuery}
+ autofocus
onClose={handleBack}
placeholder="Search conversations..."
/>
@@ -87,12 +87,12 @@
<div class="p-2 pt-16">
<SidebarNavigationSearchResults
- {searchQuery}
- {filteredConversations}
{currentChatId}
- onSelect={selectConversation}
- onEdit={handleEditConversation}
+ {filteredConversations}
onDelete={handleDeleteConversation}
+ onEdit={handleEditConversation}
+ onSelect={selectConversation}
onStop={handleStopGeneration}
+ {searchQuery}
/>
</div>
diff --git a/tools/ui/src/routes/settings/+layout.svelte b/tools/ui/src/routes/settings/+layout.svelte
index 993d64d0b6..1eeb10772a 100644
--- a/tools/ui/src/routes/settings/+layout.svelte
+++ b/tools/ui/src/routes/settings/+layout.svelte
@@ -30,7 +30,7 @@
</script>
<div class="fixed top-4.5 right-4 z-50 md:hidden">
- <ActionIcon icon={X} tooltip="Close" onclick={handleClose} />
+ <ActionIcon icon={X} onclick={handleClose} tooltip="Close" />
</div>
<div class="min-h-full">
diff --git a/tools/ui/tests/client/components/AgenticPerfWrapper.svelte b/tools/ui/tests/client/components/AgenticPerfWrapper.svelte
index 15c390a5ec..822fd17ce0 100644
--- a/tools/ui/tests/client/components/AgenticPerfWrapper.svelte
+++ b/tools/ui/tests/client/components/AgenticPerfWrapper.svelte
@@ -7,10 +7,10 @@
<Tooltip.Provider>
{#if perfState.message}
<ChatMessageAgenticContent
+ isLastAssistantMessage
+ isStreaming={perfState.isStreaming}
message={perfState.message}
toolMessages={perfState.toolMessages}
- isStreaming={perfState.isStreaming}
- isLastAssistantMessage
/>
{/if}
</Tooltip.Provider>
diff --git a/tools/ui/tests/client/components/McpServerFormWrapper.svelte b/tools/ui/tests/client/components/McpServerFormWrapper.svelte
index 7bbabbc82a..07479534be 100644
--- a/tools/ui/tests/client/components/McpServerFormWrapper.svelte
+++ b/tools/ui/tests/client/components/McpServerFormWrapper.svelte
@@ -25,13 +25,13 @@
can read it back without a custom binding API.
-->
<McpServerForm
- url="https://example.test/mcp"
headers={headersState}
- onUrlChange={() => {}}
+ id="mcp-server-form-test"
onHeadersChange={(value) => {
headersState = value;
}}
- id="mcp-server-form-test"
+ onUrlChange={() => {}}
+ url="https://example.test/mcp"
/>
-<div data-testid="captured-headers" data-captured-headers={headersState} hidden></div>
+<div data-captured-headers={headersState} data-testid="captured-headers" hidden></div>
diff --git a/tools/ui/tests/client/components/PickerListScrollHarness.svelte b/tools/ui/tests/client/components/PickerListScrollHarness.svelte
index 87746979f3..16a8f00b4f 100644
--- a/tools/ui/tests/client/components/PickerListScrollHarness.svelte
+++ b/tools/ui/tests/client/components/PickerListScrollHarness.svelte
@@ -25,13 +25,13 @@
{#if open}
<div data-testid="picker-host">
<ChatFormPickerList
- {items}
isLoading={false}
- {selectedIndex}
+ itemKey={(it) => it.id}
+ {items}
+ {scrollTrigger}
searchQuery=""
+ {selectedIndex}
showSearchInput={false}
- {scrollTrigger}
- itemKey={(it) => it.id}
>
{#snippet item(it, index, isSelected)}
<ChatFormPickerListItem dataIndex={index} {isSelected} onclick={() => {}}>
diff --git a/tools/ui/tests/stories/ChatMessage.stories.svelte b/tools/ui/tests/stories/ChatMessage.stories.svelte
index e9bf7a6f6f..270813eb38 100644
--- a/tools/ui/tests/stories/ChatMessage.stories.svelte
+++ b/tools/ui/tests/stories/ChatMessage.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import ChatMessage from '$lib/components/app/chat/ChatMessages/ChatMessage/ChatMessage.svelte';
import type { ChatMessageActions } from '$lib/types';
@@ -100,10 +100,10 @@
</script>
<Story
- name="User"
args={{
message: userMessage
}}
+ name="User"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
@@ -112,11 +112,11 @@
/>
<Story
- name="Assistant"
args={{
class: 'max-w-[56rem] w-[calc(100vw-2rem)]',
message: assistantMessage
}}
+ name="Assistant"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
@@ -125,11 +125,11 @@
/>
<Story
- name="AssistantWithReasoning"
args={{
class: 'max-w-[56rem] w-[calc(100vw-2rem)]',
message: assistantWithReasoning
}}
+ name="AssistantWithReasoning"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
@@ -138,11 +138,11 @@
/>
<Story
- name="RawLlmOutput"
args={{
class: 'max-w-[56rem] w-[calc(100vw-2rem)]',
message: rawOutputMessage
}}
+ name="RawLlmOutput"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
@@ -151,11 +151,11 @@
/>
<Story
- name="WithReasoningContent"
args={{
message: streamingMessage
}}
asChild
+ name="WithReasoningContent"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
@@ -203,15 +203,15 @@
}}
>
<div class="w-[56rem]">
- <ChatMessage message={streamingMessage} {chatActions} />
+ <ChatMessage {chatActions} message={streamingMessage} />
</div>
</Story>
<Story
- name="Processing"
args={{
message: processingMessage
}}
+ name="Processing"
play={async () => {
const { settingsStore } = await import('$lib/stores/settings/index.svelte');
diff --git a/tools/ui/tests/stories/ChatScreenForm.stories.svelte b/tools/ui/tests/stories/ChatScreenForm.stories.svelte
index 4aeddd6be3..b41ccf0a19 100644
--- a/tools/ui/tests/stories/ChatScreenForm.stories.svelte
+++ b/tools/ui/tests/stories/ChatScreenForm.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import jpgAsset from './fixtures/assets/1.jpg?url';
import pdfAsset from './fixtures/assets/example.pdf?raw';
import svgAsset from './fixtures/assets/hf-logo.svg?url';
@@ -42,8 +42,8 @@
</script>
<Story
- name="Default"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]' }}
+ name="Default"
play={async ({ canvas, userEvent }) => {
const textarea = await canvas.findByRole('textbox');
const submitButton = await canvas.findByRole('button', { name: 'Send' });
@@ -67,14 +67,14 @@
}}
/>
-<Story name="Loading" args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', isLoading: true }} />
+<Story args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', isLoading: true }} name="Loading" />
<Story
- name="FileAttachments"
args={{
class: 'max-w-[56rem] w-[calc(100vw-2rem)]',
uploadedFiles: fileAttachments
}}
+ name="FileAttachments"
play={async ({ canvas }) => {
const jpgAttachment = canvas.getByAltText('1.jpg');
const svgAttachment = canvas.getByAltText('hf-logo.svg');
diff --git a/tools/ui/tests/stories/MarkdownContent.stories.svelte b/tools/ui/tests/stories/MarkdownContent.stories.svelte
index 094573291f..b3203e3359 100644
--- a/tools/ui/tests/stories/MarkdownContent.stories.svelte
+++ b/tools/ui/tests/stories/MarkdownContent.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { AI_TUTORIAL_MD } from './fixtures/ai-tutorial.js';
import { API_DOCS_MD } from './fixtures/api-docs.js';
import { BLOG_POST_MD } from './fixtures/blog-post.js';
@@ -19,40 +19,39 @@
});
</script>
-<Story name="Empty" args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: EMPTY_MD }} />
+<Story args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: EMPTY_MD }} name="Empty" />
<Story
- name="AI Tutorial"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: AI_TUTORIAL_MD }}
+ name="AI Tutorial"
/>
<Story
- name="API Documentation"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: API_DOCS_MD }}
+ name="API Documentation"
/>
<Story
- name="Technical Blog"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: BLOG_POST_MD }}
+ name="Technical Blog"
/>
<Story
- name="Data Analysis"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: DATA_ANALYSIS_MD }}
+ name="Data Analysis"
/>
<Story
- name="README file"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: README_MD }}
+ name="README file"
/>
<Story
- name="Math Formulas"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]', content: MATH_FORMULAS_MD }}
+ name="Math Formulas"
/>
<Story
- name="URL Links"
args={{
class: 'max-w-[56rem] w-[calc(100vw-2rem)]',
content: `# URL Links Test
@@ -68,6 +67,7 @@ You can also test inline links like https://example.com or https://docs.python.o
All links should have \`target="_blank"\` and \`rel="noopener noreferrer"\` attributes for security.`
}}
+ name="URL Links"
play={async (context) => {
const { canvasElement } = context;
diff --git a/tools/ui/tests/stories/ModelsSelector.stories.svelte b/tools/ui/tests/stories/ModelsSelector.stories.svelte
index 7018d09e7b..e577226f29 100644
--- a/tools/ui/tests/stories/ModelsSelector.stories.svelte
+++ b/tools/ui/tests/stories/ModelsSelector.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import ModelsSelectorList from '$lib/components/app/models/ModelsSelectorList.svelte';
import ModelsSelectorOption from '$lib/components/app/models/ModelsSelectorOption.svelte';
@@ -122,11 +122,11 @@
<Story name="List">
<div class="w-80 rounded-lg border border-border bg-popover p-2 shadow-md">
<ModelsSelectorList
- groups={groupedOptions}
- currentModel={selectedModel}
{activeId}
- onSelect={handleSelect}
+ currentModel={selectedModel}
+ groups={groupedOptions}
onInfoClick={(modelName) => console.log('Info clicked:', modelName)}
+ onSelect={handleSelect}
/>
</div>
</Story>
@@ -134,15 +134,15 @@
<Story name="SingleLoaded">
<div class="w-80 rounded-lg border border-border bg-popover p-2 shadow-md">
<ModelsSelectorList
+ activeId={null}
+ currentModel={null}
groups={{
available: [],
favorites: [],
loaded: [loadedModels[0]]
}}
- currentModel={null}
- activeId={null}
- onSelect={handleSelect}
onInfoClick={(modelName) => console.log('Info clicked:', modelName)}
+ onSelect={handleSelect}
/>
</div>
</Story>
@@ -150,15 +150,15 @@
<Story name="WithFavoritesOnly">
<div class="w-80 rounded-lg border border-border bg-popover p-2 shadow-md">
<ModelsSelectorList
+ activeId={null}
+ currentModel={null}
groups={{
available: [],
favorites: favoriteModels,
loaded: []
}}
- currentModel={null}
- activeId={null}
- onSelect={handleSelect}
onInfoClick={(modelName) => console.log('Info clicked:', modelName)}
+ onSelect={handleSelect}
/>
</div>
</Story>
@@ -168,55 +168,60 @@
<div class="px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none">
Server model states
</div>
+
<ModelsSelectorOption
- option={mockModel('model-idle', 'Model (idle)', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('model-idle', 'Model (idle)', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('model-loading', 'Model (loading)', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('model-loading', 'Model (loading)', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('model-loaded', 'Model (loaded)', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('model-loaded', 'Model (loaded)', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('model-sleeping', 'Model (sleeping)', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('model-sleeping', 'Model (sleeping)', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('model-failed', 'Model (failed)', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('model-failed', 'Model (failed)', 'meta')}
/>
</div>
</Story>
@@ -226,45 +231,49 @@
<div class="px-2 py-2 text-[13px] font-semibold text-muted-foreground/70 select-none">
Selection states
</div>
+
<ModelsSelectorOption
- option={mockModel('normal-model', 'Normal Model', 'meta')}
- isSelected={false}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('normal-model', 'Normal Model', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('selected-model', 'Selected Model', 'meta')}
- isSelected={true}
- isHighlighted={false}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={false}
+ isSelected={true}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('selected-model', 'Selected Model', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('highlighted-model', 'Highlighted Model', 'meta')}
- isSelected={false}
- isHighlighted={true}
- isFav={false}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={false}
+ isHighlighted={true}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('highlighted-model', 'Highlighted Model', 'meta')}
/>
+
<ModelsSelectorOption
- option={mockModel('fav-model', 'Favorite Model', 'Qwen')}
- isSelected={false}
- isHighlighted={false}
- isFav={true}
hideOrgName={true}
- onSelect={() => {}}
- onMouseEnter={() => {}}
+ isFav={true}
+ isHighlighted={false}
+ isSelected={false}
onKeyDown={() => {}}
+ onMouseEnter={() => {}}
+ onSelect={() => {}}
+ option={mockModel('fav-model', 'Favorite Model', 'Qwen')}
/>
</div>
</Story>
diff --git a/tools/ui/tests/stories/PwaRefreshAlert.stories.svelte b/tools/ui/tests/stories/PwaRefreshAlert.stories.svelte
index bb2d830a27..2a0a0b4bbf 100644
--- a/tools/ui/tests/stories/PwaRefreshAlert.stories.svelte
+++ b/tools/ui/tests/stories/PwaRefreshAlert.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import PwaRefreshAlert from '$lib/components/pwa/PwaRefreshAlert.svelte';
import { expect } from 'storybook/test';
@@ -13,8 +13,8 @@
</script>
<Story
- name="Default"
args={{ needRefresh: true, updateServiceWorker: () => console.log('reload') }}
+ name="Default"
play={async ({ canvas }) => {
const title = canvas.getByText('Update available');
@@ -31,8 +31,8 @@
/>
<Story
- name="Hidden"
args={{ needRefresh: false, updateServiceWorker: () => console.log('reload') }}
+ name="Hidden"
play={async ({ canvas }) => {
const title = canvas.queryByText('Update available');
@@ -41,11 +41,11 @@
/>
<Story
- name="ClickReload"
args={{
needRefresh: true,
updateServiceWorker: () => console.log('reload')
}}
+ name="ClickReload"
play={async ({ canvas, userEvent }) => {
const button = canvas.getByRole('button', { name: 'Reload' });
diff --git a/tools/ui/tests/stories/SidebarNavigation.stories.svelte b/tools/ui/tests/stories/SidebarNavigation.stories.svelte
index ddaa90485d..ab05b1e9a7 100644
--- a/tools/ui/tests/stories/SidebarNavigation.stories.svelte
+++ b/tools/ui/tests/stories/SidebarNavigation.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import SidebarNavigation from '$lib/components/app/navigation/SidebarNavigation/SidebarNavigation.svelte';
import { waitFor } from 'storybook/test';
diff --git a/tools/ui/tests/stories/a11y/ActionIcon.a11y.stories.svelte b/tools/ui/tests/stories/a11y/ActionIcon.a11y.stories.svelte
index 5ac1f7db86..f94e7a792b 100644
--- a/tools/ui/tests/stories/a11y/ActionIcon.a11y.stories.svelte
+++ b/tools/ui/tests/stories/a11y/ActionIcon.a11y.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { Copy } from '@lucide/svelte';
import { defineMeta } from '@storybook/addon-svelte-csf';
import ActionIcon from '$lib/components/app/actions/ActionIcon.svelte';
@@ -29,6 +29,7 @@
>
<div>
<button type="button">before</button>
- <ActionIcon icon={Copy} tooltip="Copy" onclick={() => {}} />
+
+ <ActionIcon icon={Copy} onclick={() => {}} tooltip="Copy" />
</div>
</Story>
diff --git a/tools/ui/tests/stories/a11y/ChatMessageStatistics.a11y.stories.svelte b/tools/ui/tests/stories/a11y/ChatMessageStatistics.a11y.stories.svelte
index c757da51f5..ec3c269df2 100644
--- a/tools/ui/tests/stories/a11y/ChatMessageStatistics.a11y.stories.svelte
+++ b/tools/ui/tests/stories/a11y/ChatMessageStatistics.a11y.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import ChatMessageStatistics from '$lib/components/app/chat/ChatMessages/ChatMessageStatistics/ChatMessageStatistics.svelte';
import { expect } from 'storybook/test';
@@ -14,7 +14,6 @@
</script>
<Story
- name="ViewButtonsSingleTabStop"
args={{
agenticTimings: {
llm: { predicted_ms: 1000, predicted_n: 200, prompt_ms: 500, prompt_n: 100 },
@@ -29,6 +28,7 @@
promptMs: 500,
promptTokens: 100
}}
+ name="ViewButtonsSingleTabStop"
play={async ({ canvas, userEvent }) => {
const reading = await canvas.findByRole('button', { name: 'Reading' });
const generation = await canvas.findByRole('button', { name: 'Generation' });
diff --git a/tools/ui/tests/stories/a11y/ChatScreenForm.a11y.stories.svelte b/tools/ui/tests/stories/a11y/ChatScreenForm.a11y.stories.svelte
index a162f78d47..c56bfd7678 100644
--- a/tools/ui/tests/stories/a11y/ChatScreenForm.a11y.stories.svelte
+++ b/tools/ui/tests/stories/a11y/ChatScreenForm.a11y.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import ChatScreenForm from '$lib/components/app/chat/ChatScreen/ChatScreenForm.svelte';
import { ATTACHMENT_TOOLTIP_TEXT } from '$lib/constants';
@@ -15,8 +15,8 @@
</script>
<Story
- name="AddButtonSingleTabStop"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]' }}
+ name="AddButtonSingleTabStop"
play={async ({ canvas, userEvent }) => {
const textarea = await canvas.findByRole('textbox');
@@ -35,8 +35,8 @@
/>
<Story
- name="AddDropdownFocusesFirstEnabled"
args={{ class: 'max-w-[56rem] w-[calc(100vw-2rem)]' }}
+ name="AddDropdownFocusesFirstEnabled"
play={async ({ canvas, userEvent }) => {
const trigger = await canvas.findByRole('button', { name: ATTACHMENT_TOOLTIP_TEXT });
diff --git a/tools/ui/tests/stories/a11y/ScrollCarousel.a11y.stories.svelte b/tools/ui/tests/stories/a11y/ScrollCarousel.a11y.stories.svelte
index b9bf5afbc6..f1a04a9ace 100644
--- a/tools/ui/tests/stories/a11y/ScrollCarousel.a11y.stories.svelte
+++ b/tools/ui/tests/stories/a11y/ScrollCarousel.a11y.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import { ScrollCarousel } from '$lib/components/app';
import { ScrollCarouselVariant } from '$lib/enums';
@@ -34,10 +34,13 @@
>
<div>
<button type="button">before</button>
+
<ScrollCarousel class="w-96" variant={ScrollCarouselVariant.CENTER}>
<div class="h-12 w-12 shrink-0 bg-muted"></div>
+
<div class="h-12 w-12 shrink-0 bg-muted"></div>
</ScrollCarousel>
+
<button type="button">after</button>
</div>
</Story>
@@ -61,6 +64,7 @@
>
<div>
<button type="button">before</button>
+
<ScrollCarousel class="w-48" variant={ScrollCarouselVariant.CENTER}>
{#each [...Array(20).keys()] as i (i)}
<div class="h-12 w-24 shrink-0 bg-muted">{i}</div>
diff --git a/tools/ui/tests/stories/a11y/SidebarNavigationConversationItem.a11y.stories.svelte b/tools/ui/tests/stories/a11y/SidebarNavigationConversationItem.a11y.stories.svelte
index 2a80ec5305..170352bceb 100644
--- a/tools/ui/tests/stories/a11y/SidebarNavigationConversationItem.a11y.stories.svelte
+++ b/tools/ui/tests/stories/a11y/SidebarNavigationConversationItem.a11y.stories.svelte
@@ -1,4 +1,4 @@
-<script module lang="ts">
+<script lang="ts" module>
import { defineMeta } from '@storybook/addon-svelte-csf';
import SidebarNavigationConversationItem from '$lib/components/app/navigation/SidebarNavigation/SidebarNavigationConversationItem.svelte';
import { expect } from 'storybook/test';
@@ -22,8 +22,8 @@
</script>
<Story
- name="ForkIconSingleTabStop"
args={{ conversation: mockForkedConversation, depth: 1 }}
+ name="ForkIconSingleTabStop"
play={async ({ canvas, userEvent }) => {
const row = await canvas.findByRole('button', { name: /Forked Conversation/ });
const forkIcon = await canvas.findByRole('link');