-
Notifications
You must be signed in to change notification settings - Fork 4.6k
persist and reliably apply chat model selection #8734
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
01a892e
Persist chat model selection and resolve Goose defaults
morgmart 5dc7943
Fix chat model application and rollback
morgmart ed0beb9
Handle pending chat model application failures
morgmart f74fbc9
Honor requested providers for chat defaults
morgmart 048456c
Auto-select preferred models when switching agents
morgmart 4ec1eb0
Resolve ACP model aliases in picker selection
morgmart 1e4603c
Honor concrete providers and validate stored models
morgmart e882179
Keep concrete provider model fallbacks compatible
morgmart f4d2ce6
Handle inventory lookup failures for session defaults
morgmart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { useEffect } from "react"; | ||
| import { | ||
| hasSessionStarted, | ||
| type ChatSession, | ||
| } from "@/features/chat/stores/chatSessionStore"; | ||
| import { persistHomeSessionId } from "../lib/homeSessionStorage"; | ||
|
|
||
| interface UseHomeSessionStateSyncOptions { | ||
| homeSessionId: string | null; | ||
| homeSession?: ChatSession; | ||
| messagesBySession: Record<string, ArrayLike<unknown> | undefined>; | ||
| hasHydratedSessions: boolean; | ||
| isLoading: boolean; | ||
| setHomeSessionId: (sessionId: string | null) => void; | ||
| } | ||
|
|
||
| export function useHomeSessionStateSync({ | ||
| homeSessionId, | ||
| homeSession, | ||
| messagesBySession, | ||
| hasHydratedSessions, | ||
| isLoading, | ||
| setHomeSessionId, | ||
| }: UseHomeSessionStateSyncOptions): void { | ||
| useEffect(() => { | ||
| if (!homeSessionId || !hasHydratedSessions || isLoading) { | ||
| return; | ||
| } | ||
|
|
||
| if ( | ||
| !homeSession || | ||
| homeSession.archivedAt || | ||
| hasSessionStarted(homeSession, messagesBySession[homeSession.id]) | ||
| ) { | ||
| setHomeSessionId(null); | ||
| } | ||
| }, [ | ||
| hasHydratedSessions, | ||
| homeSession, | ||
| homeSession?.archivedAt, | ||
| homeSession?.messageCount, | ||
| homeSessionId, | ||
| isLoading, | ||
| messagesBySession, | ||
| setHomeSessionId, | ||
| ]); | ||
|
|
||
| useEffect(() => { | ||
| persistHomeSessionId(homeSessionId); | ||
| }, [homeSessionId]); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| const HOME_SESSION_STORAGE_KEY = "goose:home-session-id"; | ||
|
|
||
| export function loadStoredHomeSessionId(): string | null { | ||
| if (typeof window === "undefined") { | ||
| return null; | ||
| } | ||
| try { | ||
| return window.localStorage.getItem(HOME_SESSION_STORAGE_KEY); | ||
| } catch { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| export function persistHomeSessionId(sessionId: string | null): void { | ||
| if (typeof window === "undefined") { | ||
| return; | ||
| } | ||
| try { | ||
| if (sessionId) { | ||
| window.localStorage.setItem(HOME_SESSION_STORAGE_KEY, sessionId); | ||
| return; | ||
| } | ||
| window.localStorage.removeItem(HOME_SESSION_STORAGE_KEY); | ||
| } catch { | ||
| // localStorage may be unavailable | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
ui/goose2/src/app/lib/resolveSupportedSessionModelPreference.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import { beforeEach, describe, expect, it, vi } from "vitest"; | ||
| import { resolveSupportedSessionModelPreference } from "./resolveSupportedSessionModelPreference"; | ||
|
|
||
| const mockGetProviderInventory = vi.fn(); | ||
|
|
||
| vi.mock("@/features/providers/api/inventory", () => ({ | ||
| getProviderInventory: (...args: unknown[]) => | ||
| mockGetProviderInventory(...args), | ||
| })); | ||
|
|
||
| describe("resolveSupportedSessionModelPreference", () => { | ||
| beforeEach(() => { | ||
| vi.clearAllMocks(); | ||
| window.localStorage.clear(); | ||
| }); | ||
|
|
||
| it("drops the model when provider inventory lookup fails", async () => { | ||
| window.localStorage.setItem( | ||
| "goose:preferredModelsByAgent", | ||
| JSON.stringify({ | ||
| goose: { | ||
| modelId: "gpt-5.4", | ||
| modelName: "GPT-5.4", | ||
| providerId: "openai", | ||
| }, | ||
| }), | ||
| ); | ||
| mockGetProviderInventory.mockRejectedValue( | ||
| new Error("inventory unavailable"), | ||
| ); | ||
|
|
||
| await expect( | ||
| resolveSupportedSessionModelPreference("goose", new Map()), | ||
| ).resolves.toEqual({ | ||
| providerId: "openai", | ||
| }); | ||
| }); | ||
|
|
||
| it("drops the model when provider inventory has no matching entry", async () => { | ||
| window.localStorage.setItem( | ||
| "goose:preferredModelsByAgent", | ||
| JSON.stringify({ | ||
| goose: { | ||
| modelId: "gpt-5.4", | ||
| modelName: "GPT-5.4", | ||
| providerId: "openai", | ||
| }, | ||
| }), | ||
| ); | ||
| mockGetProviderInventory.mockResolvedValue([]); | ||
|
|
||
| await expect( | ||
| resolveSupportedSessionModelPreference("goose", new Map()), | ||
| ).resolves.toEqual({ | ||
| providerId: "openai", | ||
| }); | ||
| }); | ||
| }); |
36 changes: 36 additions & 0 deletions
36
ui/goose2/src/app/lib/resolveSupportedSessionModelPreference.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import type { ProviderInventoryEntryDto } from "@aaif/goose-sdk"; | ||
| import { getProviderInventory } from "@/features/providers/api/inventory"; | ||
| import { | ||
| resolveSessionModelPreference, | ||
| sanitizeSessionModelPreference, | ||
| type SessionModelPreference, | ||
| } from "@/features/chat/lib/sessionModelPreference"; | ||
|
|
||
| export async function resolveSupportedSessionModelPreference( | ||
| providerId: string, | ||
| inventoryEntries: Map<string, ProviderInventoryEntryDto>, | ||
| preferredModel?: string, | ||
| ): Promise<SessionModelPreference> { | ||
| const sessionModelPreference = resolveSessionModelPreference({ | ||
| providerId, | ||
| preferredModel, | ||
| }); | ||
|
|
||
| if (!sessionModelPreference.modelId) { | ||
| return sessionModelPreference; | ||
| } | ||
|
|
||
| const inventoryEntry = | ||
| inventoryEntries.get(sessionModelPreference.providerId) ?? | ||
| (await getProviderInventory([sessionModelPreference.providerId]) | ||
| .then(([entry]) => entry) | ||
| .catch(() => undefined)); | ||
|
|
||
| if (!inventoryEntry) { | ||
| return { | ||
| providerId: sessionModelPreference.providerId, | ||
| }; | ||
| } | ||
|
|
||
| return sanitizeSessionModelPreference(sessionModelPreference, inventoryEntry); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.