Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 48 additions & 14 deletions prototype/ui-redesign/src/components/ChatView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,8 @@ const ChatView: React.FC<ChatViewProps> = ({ currentModel, loadedModels, onModel
const [modelPickerQuery, setModelPickerQuery] = useState('');
const [modelPickerLoading, setModelPickerLoading] = useState<string | null>(null);
const [modelPickerError, setModelPickerError] = useState<string | null>(null);
const [modelPickerUnloading, setModelPickerUnloading] = useState<string | null>(null);
const [unloadAnnouncement, setUnloadAnnouncement] = useState('');
const [presetPickerOpen, setPresetPickerOpen] = useState(false);
const [presetPickerQuery, setPresetPickerQuery] = useState('');
const [presetPickerApplying, setPresetPickerApplying] = useState<string | null>(null);
Expand Down Expand Up @@ -2369,6 +2371,19 @@ ${finalText}`
setPersistHistory(prev => !prev);
}, []);

const handleModelPickerUnload = useCallback(async (modelName: string, e: React.MouseEvent) => {
e.stopPropagation();
if (modelPickerUnloading) return;
setModelPickerUnloading(modelName);
try {
await api.unloadModel(modelName);
await Promise.resolve(onRefresh());
setUnloadAnnouncement(`${modelName} unloaded`);
} finally {
setModelPickerUnloading(null);
}
}, [modelPickerUnloading, onRefresh]);

const handleModelPickerSelect = useCallback(async (option: ModelPickerOption) => {
if (option.loaded) {
onModelSelect(option.name);
Expand Down Expand Up @@ -2745,6 +2760,7 @@ ${finalText}`
)}

{/* Composer */}
<div aria-live="polite" aria-atomic="true" className="sr-only">{unloadAnnouncement}</div>
<div className="composer" onDrop={handleDrop} onDragOver={handleDragOver}>
<div className="composer__toolbar">
{(modelPickerOptions.length > 0 || modelPickerOpen) && (
Expand All @@ -2759,6 +2775,9 @@ ${finalText}`
>
<CapabilityIcon capability={currentCapability} size={14} />
<span className="composer__model-button-name">{currentModel || 'Choose model'}</span>
{selectableModels.length > 0 && (
<span className="composer__model-button-badge">({selectableModels.length})</span>
)}
<span className="composer__model-button-caret">▾</span>
</button>
{modelPickerOpen && (
Expand All @@ -2774,22 +2793,37 @@ ${finalText}`
</label>
<div className="composer__model-results" role="listbox">
{modelPickerOptions.map(option => (
<button
type="button"
<div
key={option.name}
className={`composer__model-option${option.name === currentModel ? ' is-active' : ''}`}
onClick={() => handleModelPickerSelect(option)}
disabled={!!modelPickerLoading}
role="option"
aria-selected={option.name === currentModel}
className={`composer__model-option-row${option.name === currentModel ? ' is-active' : ''}${modelPickerUnloading === option.name ? ' is-unloading' : ''}`}
>
<CapabilityIcon capability={option.capability} size={15} />
<span className="composer__model-option-text">
<strong>{option.name}</strong>
<span>{capabilityLabel(option.capability)} · {option.detail}</span>
</span>
{modelPickerLoading === option.name && <span className="composer__model-option-loading">Loading…</span>}
</button>
<button
type="button"
className="composer__model-option"
onClick={() => handleModelPickerSelect(option)}
disabled={!!modelPickerLoading || modelPickerUnloading === option.name}
role="option"
aria-selected={option.name === currentModel}
>
<CapabilityIcon capability={option.capability} size={15} />
<span className="composer__model-option-text">
<strong>{option.name}</strong>
<span>{capabilityLabel(option.capability)} · {option.detail}</span>
</span>
{modelPickerLoading === option.name && <span className="composer__model-option-loading">Loading…</span>}
</button>
{option.loaded && (
<button
type="button"
className="composer__model-option-unload"
onClick={(e) => handleModelPickerUnload(option.name, e)}
disabled={!!modelPickerUnloading}
aria-label={`Unload ${option.name}`}
>
{modelPickerUnloading === option.name ? '…' : '×'}
</button>
)}
</div>
))}
{modelPickerOptions.length === 0 && <div className="composer__model-empty">No matching models</div>}
</div>
Expand Down
63 changes: 63 additions & 0 deletions prototype/ui-redesign/src/styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -6489,6 +6489,69 @@ input, textarea {
margin-left: auto;
}

.composer__model-button-badge {
font-size: var(--text-xs);
color: var(--text-tertiary);
font-weight: 400;
flex-shrink: 0;
}

.composer__model-option-row {
display: flex;
align-items: center;
gap: var(--space-1);
border-radius: var(--radius-md);
}

.composer__model-option-row:hover,
.composer__model-option-row.is-active {
background: var(--accent-soft);
color: var(--text-primary);
}

.composer__model-option-row .composer__model-option {
flex: 1;
min-width: 0;
border-radius: 0;
}

.composer__model-option-row .composer__model-option:hover,
.composer__model-option-row .composer__model-option.is-active {
background: transparent;
}

.composer__model-option-row.is-unloading .composer__model-option {
opacity: 0.6;
cursor: wait;
}

.composer__model-option-unload {
flex-shrink: 0;
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
border-radius: var(--radius-sm);
font-size: 14px;
line-height: 1;
color: var(--text-tertiary);
opacity: 1;
transition: color 0.12s, background 0.12s;
margin-right: var(--space-1);
}

.composer__model-option-unload:hover {
color: var(--danger);
background: var(--danger-soft);
}

.composer__model-option-row.is-unloading .composer__model-option-unload {
opacity: 1;
color: var(--text-tertiary);
cursor: wait;
}

.composer__model-error {
margin-top: var(--space-2);
padding: var(--space-2);
Expand Down
Loading