[codex] fix profile scoped model selection (#881)

* fix profile scoped model selection

* test profile scoped provider refresh
This commit is contained in:
ekko
2026-05-20 18:26:01 +08:00
committed by GitHub
parent cd77e5ba2e
commit 40109e9c42
18 changed files with 119 additions and 26 deletions
@@ -157,7 +157,7 @@ function getModelGroupsForProfile(profile: string) {
const profileModels = appStore.profileModelGroups.find(
(entry) => entry.profile === profile,
);
return profileModels?.groups?.length ? profileModels.groups : appStore.modelGroups;
return profileModels?.groups || [];
}
function getDefaultModelForProfile(profile: string) {
@@ -449,7 +449,7 @@ async function handleContextMenuSelect(key: string) {
workspaceValue.value = session?.workspace || "";
showWorkspaceModal.value = true;
} else if (key === "model") {
openSessionModelModal(contextSessionId.value);
await openSessionModelModal(contextSessionId.value);
} else if (key === "rename") {
const session = chatStore.sessions.find(
(s) => s.id === contextSessionId.value,
@@ -522,13 +522,13 @@ const sessionModelProvider = ref("");
const sessionModelCustomInput = ref("");
const sessionModelCustomProvider = ref("");
const sessionModelProfile = computed(() => {
const sessionModelProfile = computed<string | null>(() => {
const session = chatStore.sessions.find((s) => s.id === sessionModelSessionId.value);
return session?.profile || profilesStore.activeProfileName || "default";
return session?.profile || null;
});
const sessionModelBaseGroups = computed(() =>
getModelGroupsForProfile(sessionModelProfile.value),
sessionModelProfile.value ? getModelGroupsForProfile(sessionModelProfile.value) : [],
);
const sessionModelProviderOptions = computed(() =>
@@ -561,9 +561,14 @@ const filteredSessionModelGroups = computed(() => {
.filter((group) => group.models.length > 0 || group.label.toLowerCase().includes(query));
});
function openSessionModelModal(sessionId: string) {
async function openSessionModelModal(sessionId: string) {
if (appStore.modelGroups.length === 0 && appStore.profileModelGroups.length === 0) {
await appStore.loadModels();
}
const session = chatStore.sessions.find((s) => s.id === sessionId);
const defaults = getDefaultModelForProfile(session?.profile || profilesStore.activeProfileName || "default");
const defaults = session?.profile
? getDefaultModelForProfile(session.profile)
: { provider: "", model: "" };
sessionModelSessionId.value = sessionId;
sessionModelValue.value = session?.model || defaults.model || "";
sessionModelProvider.value = session?.provider || defaults.provider || "";
@@ -1626,6 +1631,26 @@ async function handleSessionModelCustomSubmit() {
&.active .session-item-title {
color: $accent-primary;
}
&.missing-models {
color: #b42318;
background: rgba(220, 38, 38, 0.08);
.session-item-title,
.session-item-profile-name,
.session-item-time {
color: #b42318;
}
.session-item-model {
color: #b42318;
background: rgba(220, 38, 38, 0.12);
}
&:hover {
background: rgba(220, 38, 38, 0.12);
}
}
}
:deep(.session-item-content) {
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { computed, ref, onUnmounted } from 'vue'
import { NPopconfirm, NCheckbox } from 'naive-ui'
import { NPopconfirm, NCheckbox, NTooltip } from 'naive-ui'
import { useI18n } from 'vue-i18n'
import type { Session } from '@/stores/hermes/chat'
import { useAppStore } from '@/stores/hermes/app'
@@ -38,6 +38,13 @@ const sessionModelName = computed(() =>
)
const profileName = computed(() => props.session.profile || 'default')
const profileAvatar = computed(() => profilesStore.profiles.find(profile => profile.name === profileName.value)?.avatar)
const profileHasModels = computed(() => {
const profileModels = appStore.profileModelGroups.find(profile => profile.profile === profileName.value)
return !!profileModels?.groups?.some(group => group.models.length > 0)
})
const profileModelsMissing = computed(() =>
appStore.profileModelGroups.length > 0 && !profileHasModels.value,
)
let longPressTimer: ReturnType<typeof setTimeout> | null = null
const longPressTriggered = ref(false)
@@ -86,7 +93,7 @@ onUnmounted(() => {
<template>
<button
class="session-item"
:class="{ active, 'batch-mode': selectable }"
:class="{ active, 'batch-mode': selectable, 'missing-models': profileModelsMissing }"
:aria-current="active ? 'page' : undefined"
@click="onClick"
@contextmenu="emit('contextmenu', $event)"
@@ -110,6 +117,14 @@ onUnmounted(() => {
<svg v-if="streaming" class="session-item-streaming" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><path d="M12 2v4M12 18v4M4.93 4.93l2.83 2.83M16.24 16.24l2.83 2.83M2 12h4M18 12h4M4.93 19.07l2.83-2.83M16.24 7.76l2.83-2.83"/></svg>
{{ session.title }}
</span>
<NTooltip v-if="profileModelsMissing" trigger="click" placement="top">
<template #trigger>
<button class="session-item-warning" type="button" @click.stop>
!
</button>
</template>
{{ t('chat.profileMissingModelsTip', { profile: profileName }) }}
</NTooltip>
</span>
<span class="session-item-meta">
<span v-if="sessionModelName" class="session-item-model" :title="session.model">{{ sessionModelName }}</span>
@@ -153,4 +168,18 @@ onUnmounted(() => {
line-height: 16px;
color: var(--text-muted);
}
.session-item-warning {
flex-shrink: 0;
width: 16px;
height: 16px;
border: 1px solid rgba(180, 35, 24, 0.35);
border-radius: 50%;
background: rgba(220, 38, 38, 0.1);
color: #b42318;
font-size: 11px;
font-weight: 700;
line-height: 14px;
cursor: pointer;
}
</style>