Skip to content

Commit f0912ed

Browse files
Jonathan McMichaelJonathan McMichael
authored andcommitted
Add preferred Pi model settings and pickers
1 parent 5bd5ba2 commit f0912ed

9 files changed

Lines changed: 824 additions & 224 deletions

File tree

‎apps/web/src/components/KeybindingsToast.browser.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ function createBaseServerConfig(): ServerConfig {
111111
enabled: true,
112112
binaryPath: "",
113113
defaultProvider: "",
114+
defaultModel: "",
115+
favoriteModels: [],
114116
customModels: [],
115117
},
116118
},

‎apps/web/src/components/NoActiveThreadState.tsx‎

Lines changed: 232 additions & 201 deletions
Large diffs are not rendered by default.

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import {
3939
expandCollapsedComposerCursor,
4040
replaceTextRange,
4141
} from "../../composer-logic";
42+
import { getCustomModelOptionsByProvider } from "../../modelSelection";
4243
import { deriveComposerSendState, readFileAsDataUrl } from "../ChatView.logic";
4344
import {
4445
type ComposerImageAttachment,
@@ -609,13 +610,16 @@ export const ChatComposer = memo(
609610
const selectedModelForPicker = selectedModel;
610611
const modelOptionsByProvider = useMemo(
611612
() =>
612-
new Map<ProviderKind, ReadonlyArray<ServerProvider["models"][number]>>(
613-
providerStatuses.map((provider) => [provider.provider, provider.models]),
613+
getCustomModelOptionsByProvider(
614+
settings,
615+
providerStatuses,
616+
selectedProvider,
617+
selectedModelForPicker,
614618
),
615-
[providerStatuses],
619+
[providerStatuses, selectedModelForPicker, selectedProvider, settings],
616620
);
617621
const selectedModelForPickerWithCustomFallback = useMemo(() => {
618-
const currentOptions = modelOptionsByProvider.get(selectedProvider) ?? [];
622+
const currentOptions = modelOptionsByProvider[selectedProvider] ?? [];
619623
return currentOptions.some((option) => option.slug === selectedModelForPicker)
620624
? selectedModelForPicker
621625
: (normalizeModelSlug(selectedModelForPicker, selectedProvider) ?? selectedModelForPicker);
@@ -633,7 +637,7 @@ export const ChatComposer = memo(
633637
pickerProviders
634638
.filter((provider) => lockedProvider === null || provider.provider === lockedProvider)
635639
.flatMap((provider) =>
636-
(modelOptionsByProvider.get(provider.provider) ?? []).map(({ slug, name }) => ({
640+
(modelOptionsByProvider[provider.provider] ?? []).map(({ slug, name }) => ({
637641
provider: provider.provider,
638642
providerLabel: formatProviderDisplayLabel(provider.provider),
639643
slug,

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 233 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ import {
4444
} from "../../lib/desktopUpdateReactQuery";
4545
import {
4646
MAX_CUSTOM_MODEL_LENGTH,
47+
getAppModelOptions,
48+
getConfiguredFavoriteModelOptions,
4749
getCustomModelOptionsByProvider,
4850
resolveAppModelSelectionState,
51+
resolveProviderDefaultModel,
4952
} from "../../modelSelection";
5053
import { ensureLocalApi, readLocalApi } from "../../localApi";
5154
import { useShallow } from "zustand/react/shallow";
@@ -58,6 +61,7 @@ import { formatRelativeTime, formatRelativeTimeLabel } from "../../timestampForm
5861
import { cn } from "../../lib/utils";
5962
import { Badge } from "../ui/badge";
6063
import { Button } from "../ui/button";
64+
import { Checkbox } from "../ui/checkbox";
6165
import { Collapsible, CollapsibleContent } from "../ui/collapsible";
6266
import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "../ui/empty";
6367
import { Input } from "../ui/input";
@@ -95,6 +99,8 @@ const THEME_OPTIONS = [
9599
},
96100
] as const;
97101

102+
const PI_AUTO_DEFAULT_MODEL_VALUE = "__auto__";
103+
98104
interface PiBackendStatus {
99105
readonly id: string;
100106
readonly label: string;
@@ -760,6 +766,8 @@ export function GeneralSettingsPanel() {
760766
settings.providers.pi.binaryPath !== DEFAULT_UNIFIED_SETTINGS.providers.pi.binaryPath ||
761767
settings.providers.pi.defaultProvider !==
762768
DEFAULT_UNIFIED_SETTINGS.providers.pi.defaultProvider ||
769+
settings.providers.pi.defaultModel !== DEFAULT_UNIFIED_SETTINGS.providers.pi.defaultModel ||
770+
settings.providers.pi.favoriteModels.length > 0 ||
763771
settings.providers.pi.customModels.length > 0,
764772
),
765773
});
@@ -826,6 +834,34 @@ export function GeneralSettingsPanel() {
826834
textGenProvider,
827835
textGenModel,
828836
);
837+
const piAvailableModelOptions = useMemo(
838+
() => getAppModelOptions(settings, serverProviders, "pi"),
839+
[serverProviders, settings],
840+
);
841+
const piFavoriteModelOptions = useMemo(
842+
() => getConfiguredFavoriteModelOptions(settings, serverProviders, "pi"),
843+
[serverProviders, settings],
844+
);
845+
const piDefaultModelOptions = useMemo(
846+
() =>
847+
piFavoriteModelOptions.length > 0
848+
? piFavoriteModelOptions
849+
: piAvailableModelOptions.map(({ slug, name }) => ({ slug, name })),
850+
[piAvailableModelOptions, piFavoriteModelOptions],
851+
);
852+
const piConfiguredDefaultModel = useMemo(
853+
() => normalizeModelSlug(settings.providers.pi.defaultModel, "pi"),
854+
[settings.providers.pi.defaultModel],
855+
);
856+
const piDefaultSelectValue =
857+
piConfiguredDefaultModel &&
858+
piDefaultModelOptions.some((option) => option.slug === piConfiguredDefaultModel)
859+
? piConfiguredDefaultModel
860+
: PI_AUTO_DEFAULT_MODEL_VALUE;
861+
const piResolvedDefaultModel = useMemo(
862+
() => resolveProviderDefaultModel("pi", settings, serverProviders),
863+
[serverProviders, settings],
864+
);
829865
const isGitWritingModelDirty = !Equal.equals(
830866
settings.textGenerationModelSelection ?? null,
831867
DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection ?? null,
@@ -947,15 +983,31 @@ export function GeneralSettingsPanel() {
947983

948984
const removeCustomModel = useCallback(
949985
(provider: ProviderKind, slug: string) => {
986+
const nextProviderSettings =
987+
provider === "pi"
988+
? {
989+
...settings.providers[provider],
990+
customModels: settings.providers[provider].customModels.filter(
991+
(model) => model !== slug,
992+
),
993+
favoriteModels: settings.providers.pi.favoriteModels.filter(
994+
(model) => model !== slug,
995+
),
996+
defaultModel:
997+
normalizeModelSlug(settings.providers.pi.defaultModel, "pi") === slug
998+
? ""
999+
: settings.providers.pi.defaultModel,
1000+
}
1001+
: {
1002+
...settings.providers[provider],
1003+
customModels: settings.providers[provider].customModels.filter(
1004+
(model) => model !== slug,
1005+
),
1006+
};
9501007
updateSettings({
9511008
providers: {
9521009
...settings.providers,
953-
[provider]: {
954-
...settings.providers[provider],
955-
customModels: settings.providers[provider].customModels.filter(
956-
(model) => model !== slug,
957-
),
958-
},
1010+
[provider]: nextProviderSettings,
9591011
},
9601012
});
9611013
setCustomModelErrorByProvider((existing) => ({
@@ -1679,6 +1731,181 @@ export function GeneralSettingsPanel() {
16791731
/>
16801732
) : null}
16811733

1734+
{providerCard.provider === "pi" ? (
1735+
<div className="border-t border-border/60 px-4 py-3 sm:px-5">
1736+
<div className="flex items-center justify-between gap-3">
1737+
<div>
1738+
<div className="text-xs font-medium text-foreground">
1739+
Preferred models
1740+
</div>
1741+
<div className="mt-1 text-xs text-muted-foreground">
1742+
Choose which Pi models appear by default in the splash and composer
1743+
pickers.
1744+
</div>
1745+
</div>
1746+
{piFavoriteModelOptions.length > 0 ? (
1747+
<Button
1748+
type="button"
1749+
size="xs"
1750+
variant="ghost"
1751+
onClick={() =>
1752+
updateSettings({
1753+
providers: {
1754+
...settings.providers,
1755+
pi: {
1756+
...settings.providers.pi,
1757+
favoriteModels: [],
1758+
},
1759+
},
1760+
})
1761+
}
1762+
>
1763+
Clear
1764+
</Button>
1765+
) : null}
1766+
</div>
1767+
1768+
<label htmlFor="provider-install-pi-default-model" className="mt-3 block">
1769+
<span className="text-xs font-medium text-foreground">Default model</span>
1770+
<Select
1771+
value={piDefaultSelectValue}
1772+
onValueChange={(value) =>
1773+
updateSettings({
1774+
providers: {
1775+
...settings.providers,
1776+
pi: {
1777+
...settings.providers.pi,
1778+
defaultModel:
1779+
value == null || value === PI_AUTO_DEFAULT_MODEL_VALUE
1780+
? ""
1781+
: value,
1782+
},
1783+
},
1784+
})
1785+
}
1786+
>
1787+
<SelectTrigger
1788+
id="provider-install-pi-default-model"
1789+
className="mt-1.5 w-full"
1790+
aria-label="Default Pi model"
1791+
>
1792+
<SelectValue>
1793+
{piDefaultSelectValue === PI_AUTO_DEFAULT_MODEL_VALUE
1794+
? `Automatic (${
1795+
piDefaultModelOptions.find(
1796+
(option) => option.slug === piResolvedDefaultModel,
1797+
)?.name ?? piResolvedDefaultModel
1798+
})`
1799+
: (piDefaultModelOptions.find(
1800+
(option) => option.slug === piDefaultSelectValue,
1801+
)?.name ?? piDefaultSelectValue)}
1802+
</SelectValue>
1803+
</SelectTrigger>
1804+
<SelectPopup align="end" alignItemWithTrigger={false}>
1805+
<SelectItem hideIndicator value={PI_AUTO_DEFAULT_MODEL_VALUE}>
1806+
{`Automatic (${
1807+
piDefaultModelOptions.find(
1808+
(option) => option.slug === piResolvedDefaultModel,
1809+
)?.name ?? piResolvedDefaultModel
1810+
})`}
1811+
</SelectItem>
1812+
{piDefaultModelOptions.map((option) => (
1813+
<SelectItem hideIndicator key={option.slug} value={option.slug}>
1814+
{option.name}
1815+
</SelectItem>
1816+
))}
1817+
</SelectPopup>
1818+
</Select>
1819+
<span className="mt-1 block text-xs text-muted-foreground">
1820+
{piFavoriteModelOptions.length > 0
1821+
? "Automatic uses the first preferred model."
1822+
: "Automatic uses the first available Pi model."}
1823+
</span>
1824+
</label>
1825+
1826+
<div className="mt-3">
1827+
<div className="flex items-center justify-between gap-3">
1828+
<div className="text-xs font-medium text-foreground">
1829+
Visible in picker
1830+
</div>
1831+
<div className="text-[11px] text-muted-foreground">
1832+
{piFavoriteModelOptions.length} selected
1833+
</div>
1834+
</div>
1835+
1836+
{piAvailableModelOptions.length === 0 ? (
1837+
<div className="mt-2 rounded-md border border-dashed border-border/60 px-3 py-2 text-xs text-muted-foreground">
1838+
Pi has not reported any available models yet. Sign in or refresh the
1839+
provider status to load them.
1840+
</div>
1841+
) : (
1842+
<div className="mt-2 max-h-44 overflow-y-auto rounded-md border border-border/60 bg-background/60">
1843+
{piAvailableModelOptions.map((model) => {
1844+
const isChecked = piFavoriteModelOptions.some(
1845+
(option) => option.slug === model.slug,
1846+
);
1847+
const isResolvedDefault = piResolvedDefaultModel === model.slug;
1848+
1849+
return (
1850+
<label
1851+
key={model.slug}
1852+
className="flex cursor-pointer items-center gap-2 border-b border-border/40 px-3 py-2 last:border-b-0"
1853+
>
1854+
<Checkbox
1855+
checked={isChecked}
1856+
onCheckedChange={(checked) => {
1857+
const nextFavoriteSlugs = new Set(
1858+
piFavoriteModelOptions.map((option) => option.slug),
1859+
);
1860+
if (checked) {
1861+
nextFavoriteSlugs.add(model.slug);
1862+
} else {
1863+
nextFavoriteSlugs.delete(model.slug);
1864+
}
1865+
const orderedFavoriteModels = piAvailableModelOptions
1866+
.map((option) => option.slug)
1867+
.filter((slug) => nextFavoriteSlugs.has(slug));
1868+
const nextDefaultModel =
1869+
orderedFavoriteModels.length > 0 &&
1870+
piConfiguredDefaultModel &&
1871+
!orderedFavoriteModels.includes(piConfiguredDefaultModel)
1872+
? ""
1873+
: settings.providers.pi.defaultModel;
1874+
1875+
updateSettings({
1876+
providers: {
1877+
...settings.providers,
1878+
pi: {
1879+
...settings.providers.pi,
1880+
favoriteModels: orderedFavoriteModels,
1881+
defaultModel: nextDefaultModel,
1882+
},
1883+
},
1884+
});
1885+
}}
1886+
/>
1887+
<span className="min-w-0 flex-1 truncate text-xs text-foreground/90">
1888+
{model.name}
1889+
</span>
1890+
{isResolvedDefault ? (
1891+
<Badge variant="secondary" size="sm" className="shrink-0">
1892+
Default
1893+
</Badge>
1894+
) : null}
1895+
{model.isCustom ? (
1896+
<span className="shrink-0 text-[10px] text-muted-foreground">
1897+
custom
1898+
</span>
1899+
) : null}
1900+
</label>
1901+
);
1902+
})}
1903+
</div>
1904+
)}
1905+
</div>
1906+
</div>
1907+
) : null}
1908+
16821909
<div className="border-t border-border/60 px-4 py-3 sm:px-5">
16831910
<div className="text-xs font-medium text-foreground">Models</div>
16841911
<div className="mt-1 text-xs text-muted-foreground">

0 commit comments

Comments
 (0)