From 9920efa16d078777a4d9715b2f00d8800a4da188 Mon Sep 17 00:00:00 2001 From: Seydi Charyyev Date: Tue, 20 Oct 2026 00:05:22 +0000 Subject: [PATCH] fix(desktop): show model changes when the provider reports no resolved model (#12914) Signed-off-by: Seydi Charyyev Co-authored-by: Lifei Zhou --- crates/goose/src/acp/server/load_session.rs | 29 +++++ crates/goose/src/acp/server/message_meta.rs | 63 +++++++++++ .../sessionNotificationAdapter.test.ts | 78 ++++++++++++++ ui/desktop/src/acp/adapter/messages.ts | 9 +- ui/desktop/src/acp/adapter/shared.ts | 28 ++++- ui/desktop/src/acp/adapter/tools.ts | 2 + .../src/components/MessageList.test.tsx | 81 +++++++++++++- ui/desktop/src/components/MessageList.tsx | 32 +++--- .../src/components/messageRowContext.test.ts | 101 +++++++++++++++++- .../src/components/messageRowContext.ts | 50 +++++++-- ui/desktop/src/i18n/messages/de.json | 3 + ui/desktop/src/i18n/messages/en.json | 3 + ui/desktop/src/i18n/messages/es.json | 3 + ui/desktop/src/i18n/messages/fr.json | 3 + ui/desktop/src/i18n/messages/hi.json | 3 + ui/desktop/src/i18n/messages/id.json | 3 + ui/desktop/src/i18n/messages/it.json | 3 + ui/desktop/src/i18n/messages/ja.json | 3 + ui/desktop/src/i18n/messages/ko.json | 3 + ui/desktop/src/i18n/messages/ms.json | 3 + ui/desktop/src/i18n/messages/pt.json | 3 + ui/desktop/src/i18n/messages/ru.json | 3 + ui/desktop/src/i18n/messages/tr.json | 3 + ui/desktop/src/i18n/messages/vi.json | 3 + ui/desktop/src/i18n/messages/zh-CN.json | 3 + ui/desktop/src/i18n/messages/zh-TW.json | 3 + 26 files changed, 493 insertions(+), 28 deletions(-) diff --git a/crates/goose/src/acp/server/load_session.rs b/crates/goose/src/acp/server/load_session.rs index 99b2f452d..16c8a7b55 100644 --- a/crates/goose/src/acp/server/load_session.rs +++ b/crates/goose/src/acp/server/load_session.rs @@ -655,6 +655,35 @@ mod tests { assert!(conversation.messages()[2].content.is_empty()); } + #[test] + fn acp_replay_sends_the_model_that_produced_each_message() { + let conversation = Conversation::new_unvalidated([Message::assistant() + .with_text("answer") + .with_id("msg_replayed") + .with_inference(InferenceMetadata { + provider: "anthropic".to_string(), + requested_model: "claude-sonnet-4-5".to_string(), + resolved_model: None, + provider_session_id: None, + })]); + + let messages = messages_for_acp_replay(&conversation); + let chunk = + content_chunk_for_message(&messages[0], ContentBlock::Text(TextContent::new("answer"))); + + assert_eq!( + chunk + .meta + .as_ref() + .and_then(|meta| meta.get("goose")) + .and_then(|goose| goose.get("inference")), + Some(&serde_json::json!({ + "provider": "anthropic", + "requestedModel": "claude-sonnet-4-5", + })), + ); + } + fn persisted_enriched_tool_request() -> ToolRequest { ToolRequest { id: "req_first".to_string(), diff --git a/crates/goose/src/acp/server/message_meta.rs b/crates/goose/src/acp/server/message_meta.rs index 85765a8c4..d96882f21 100644 --- a/crates/goose/src/acp/server/message_meta.rs +++ b/crates/goose/src/acp/server/message_meta.rs @@ -17,6 +17,18 @@ struct GooseMessageMeta<'a> { output_token_limit_reached: bool, #[serde(skip_serializing_if = "std::ops::Not::not")] fallback_content: bool, + #[serde(skip_serializing_if = "Option::is_none")] + inference: Option>, +} + +// The provider session id stays on the server: clients only need to know which model answered. +#[derive(Serialize)] +#[serde(rename_all = "camelCase")] +struct GooseInferenceMeta<'a> { + provider: &'a str, + requested_model: &'a str, + #[serde(skip_serializing_if = "Option::is_none")] + resolved_model: Option<&'a str>, } fn goose_message_meta( @@ -29,6 +41,15 @@ fn goose_message_meta( steer, output_token_limit_reached: message.metadata.output_token_limit_reached, fallback_content: has_output_token_limit_fallback_content(message), + inference: message + .metadata + .inference + .as_ref() + .map(|inference| GooseInferenceMeta { + provider: &inference.provider, + requested_model: &inference.requested_model, + resolved_model: inference.resolved_model.as_deref(), + }), }; match serde_json::to_value(message_meta) { @@ -102,6 +123,7 @@ fn has_output_token_limit_fallback_content(message: &Message) -> bool { #[cfg(test)] mod tests { use super::*; + use crate::conversation::message::InferenceMetadata; use agent_client_protocol::schema::v1::TextContent; use rmcp::model::Role; @@ -189,6 +211,47 @@ mod tests { ); } + #[test] + fn content_chunk_carries_inference_without_provider_session_id() { + let inference = InferenceMetadata { + provider: "openai".to_string(), + requested_model: "gpt-4o".to_string(), + resolved_model: None, + provider_session_id: Some("provider-session".to_string()), + }; + let message = Message::new(Role::Assistant, 1_700_000_000, vec![]) + .with_id("msg_live") + .with_inference(inference.clone()); + let chunk = content_chunk_for_message(&message, ContentBlock::Text(TextContent::new("hi"))); + + assert_eq!( + chunk.meta.as_ref().and_then(|meta| meta.get("goose")), + Some(&serde_json::json!({ + "created": 1_700_000_000, + "messageId": "msg_live", + "inference": { + "provider": "openai", + "requestedModel": "gpt-4o", + }, + })), + ); + + let resolved_message = message.with_inference(InferenceMetadata { + resolved_model: Some("gpt-4o-2024-08-06".to_string()), + ..inference + }); + assert_eq!( + message_meta(&resolved_message) + .get("goose") + .and_then(|goose| goose.get("inference")), + Some(&serde_json::json!({ + "provider": "openai", + "requestedModel": "gpt-4o", + "resolvedModel": "gpt-4o-2024-08-06", + })), + ); + } + #[test] fn populate_output_token_limit_content_only_changes_empty_marked_assistant_messages() { let mut message = Message::new(Role::Assistant, 1_700_000_000, vec![]) diff --git a/ui/desktop/src/acp/__tests__/sessionNotificationAdapter.test.ts b/ui/desktop/src/acp/__tests__/sessionNotificationAdapter.test.ts index 1ca09a1e6..7e1e5c119 100644 --- a/ui/desktop/src/acp/__tests__/sessionNotificationAdapter.test.ts +++ b/ui/desktop/src/acp/__tests__/sessionNotificationAdapter.test.ts @@ -408,6 +408,84 @@ describe('createAcpSessionNotificationAdapter', () => { }); expect(messages[0].metadata.outputTokenLimitReached).toBe(true); }); + + it('stores the model that produced each assistant message', () => { + const adapter = createAcpSessionNotificationAdapter(); + const inference = { provider: 'openai', requestedModel: 'gpt-4o' }; + + adapter.apply( + acpUpdate({ + sessionUpdate: 'agent_thought_chunk', + content: { type: 'text', text: 'Thinking' }, + _meta: { goose: { messageId: 'msg-1', inference } }, + } as SessionNotification['update']) + ); + adapter.apply( + acpUpdate({ + sessionUpdate: 'agent_message_chunk', + content: { type: 'text', text: 'Answer' }, + _meta: { goose: { messageId: 'msg-1', inference } }, + } as SessionNotification['update']) + ); + const messages = expectOnlyMessagesChange( + adapter.apply( + acpUpdate({ + ...DEFAULT_TOOL_CALL, + _meta: { + goose: { + messageId: 'msg-2', + inference: { + provider: 'openai', + requestedModel: 'gpt-4o-mini', + resolvedModel: 'gpt-4o-mini-2024-07-18', + providerSessionId: 'not-for-clients', + }, + }, + }, + }) + ) + ); + + expect(messages.map((message) => message.metadata.inference)).toEqual([ + { provider: 'openai', requestedModel: 'gpt-4o' }, + { + provider: 'openai', + requestedModel: 'gpt-4o-mini', + resolvedModel: 'gpt-4o-mini-2024-07-18', + }, + ]); + }); + + it('ignores malformed inference metadata and inference on user messages', () => { + const adapter = createAcpSessionNotificationAdapter(); + + adapter.apply( + acpUpdate({ + sessionUpdate: 'user_message_chunk', + content: { type: 'text', text: 'Hi' }, + _meta: { + goose: { + messageId: 'user-1', + inference: { provider: 'openai', requestedModel: 'gpt-4o' }, + }, + }, + } as SessionNotification['update']) + ); + const messages = expectOnlyMessagesChange( + adapter.apply( + acpUpdate({ + sessionUpdate: 'agent_message_chunk', + content: { type: 'text', text: 'Hello' }, + _meta: { goose: { messageId: 'msg-1', inference: { provider: 'openai' } } }, + } as SessionNotification['update']) + ) + ); + + expect(messages.map((message) => message.metadata.inference)).toEqual([ + undefined, + undefined, + ]); + }); }); describe('tools', () => { diff --git a/ui/desktop/src/acp/adapter/messages.ts b/ui/desktop/src/acp/adapter/messages.ts index a91ab1cc4..bc4a2eeef 100644 --- a/ui/desktop/src/acp/adapter/messages.ts +++ b/ui/desktop/src/acp/adapter/messages.ts @@ -6,6 +6,7 @@ import type { ContentBlock, Message } from '../../types/message'; import { type AcpChatStateChange, type AdapterState, + applyInferenceMeta, DEFAULT_VISIBLE_MESSAGE_METADATA, getGooseMessageMeta, messagesChange, @@ -40,6 +41,7 @@ export function applyContentChunk( existing.metadata.fallbackContent = shouldSkipFallbackChunk ? undefined : gooseMeta.fallbackContent; + applyInferenceMeta(existing, gooseMeta); if (shouldSkipFallbackChunk) { return messagesChangeWithLocalSteerConfirmation(state, existing, gooseMeta.steer); @@ -60,7 +62,7 @@ export function applyContentChunk( return messagesChangeWithLocalSteerConfirmation(state, existing, gooseMeta.steer); } else { - state.messages.push({ + const message: Message = { ...(messageId ? { id: messageId } : {}), role, created: gooseMeta.created ?? Math.floor(Date.now() / 1000), @@ -71,7 +73,9 @@ export function applyContentChunk( outputTokenLimitReached: gooseMeta.outputTokenLimitReached, fallbackContent: gooseMeta.fallbackContent, }, - }); + }; + applyInferenceMeta(message, gooseMeta); + state.messages.push(message); } return messagesChange(state); @@ -101,6 +105,7 @@ export function applyThoughtChunk( } message.metadata.outputTokenLimitReached = gooseMeta.outputTokenLimitReached; + applyInferenceMeta(message, gooseMeta); const lastContent = message.content[message.content.length - 1]; if (lastContent?.type === 'thinking') { diff --git a/ui/desktop/src/acp/adapter/shared.ts b/ui/desktop/src/acp/adapter/shared.ts index 3a94611fe..a8c249bdc 100644 --- a/ui/desktop/src/acp/adapter/shared.ts +++ b/ui/desktop/src/acp/adapter/shared.ts @@ -1,6 +1,6 @@ import type { ToolCall, ToolCallUpdate } from '@agentclientprotocol/sdk'; import type { TokenState } from '../../types/chat'; -import type { Message, NotificationEvent } from '../../types/message'; +import type { InferenceMetadata, Message, NotificationEvent } from '../../types/message'; export type AcpChatStateChange = | { type: 'messages'; messages: Message[] } @@ -29,6 +29,7 @@ export interface GooseMessageMeta { outputTokenLimitReached?: boolean; fallbackContent?: boolean; steer?: boolean; + inference?: InferenceMetadata; } export interface ToolIdentity { @@ -75,9 +76,34 @@ export function getGooseMessageMeta(update: { _meta?: unknown }): GooseMessageMe outputTokenLimitReached: outputTokenLimitReached ? true : undefined, fallbackContent: goose.fallbackContent === true ? true : undefined, steer: goose.steer === true ? true : undefined, + inference: getInferenceMeta(goose.inference), }; } +function getInferenceMeta(inference: unknown): InferenceMetadata | undefined { + if ( + !isRecord(inference) || + typeof inference.provider !== 'string' || + typeof inference.requestedModel !== 'string' + ) { + return undefined; + } + + return { + provider: inference.provider, + requestedModel: inference.requestedModel, + ...(typeof inference.resolvedModel === 'string' + ? { resolvedModel: inference.resolvedModel } + : {}), + }; +} + +export function applyInferenceMeta(message: Message, gooseMeta: GooseMessageMeta): void { + if (message.role === 'assistant' && gooseMeta.inference) { + message.metadata.inference = gooseMeta.inference; + } +} + export function getGooseActiveRunId(update: { _meta?: unknown }): string | null | undefined { if (!isRecord(update._meta)) { return undefined; diff --git a/ui/desktop/src/acp/adapter/tools.ts b/ui/desktop/src/acp/adapter/tools.ts index 87d1534e9..ff877a223 100644 --- a/ui/desktop/src/acp/adapter/tools.ts +++ b/ui/desktop/src/acp/adapter/tools.ts @@ -10,6 +10,7 @@ import { toolNotificationChange } from './toolNotifications'; import { type AcpChatStateChange, type AdapterState, + applyInferenceMeta, DEFAULT_VISIBLE_MESSAGE_METADATA, type GooseMessageMeta, getGooseMessageMeta, @@ -26,6 +27,7 @@ export function applyToolCall(state: AdapterState, update: ToolCall): AcpChatSta const gooseMeta = getGooseMessageMeta(update); const message = getOrCreateAssistantMessageForUpdate(state, gooseMeta); + applyInferenceMeta(message, gooseMeta); if ( message.content.some( diff --git a/ui/desktop/src/components/MessageList.test.tsx b/ui/desktop/src/components/MessageList.test.tsx index 139f8e5f5..23a1a6056 100644 --- a/ui/desktop/src/components/MessageList.test.tsx +++ b/ui/desktop/src/components/MessageList.test.tsx @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { act, render, screen } from '@testing-library/react'; import type { IpcRendererEvent } from 'electron'; -import type { ImageData, Message, MessageContent } from '../types/message'; +import type { ImageData, InferenceMetadata, Message, MessageContent } from '../types/message'; import { IntlTestWrapper } from '../i18n/test-utils'; import MessageList from './MessageList'; @@ -198,6 +198,85 @@ describe('MessageList render isolation', () => { }); }); +describe('MessageList model change disclosure', () => { + function assistantWithModel(id: string, inference: InferenceMetadata): Message { + return { + ...message(id, 'assistant', [{ type: 'text', text: id }]), + metadata: { ...visibleMetadata, inference }, + }; + } + + it('labels models that the provider did not confirm as requested', () => { + renderList([ + assistantWithModel('assistant-1', { provider: 'test', requestedModel: 'model-a' }), + message('user-1', 'user', [{ type: 'text', text: 'Switch model' }]), + assistantWithModel('assistant-2', { provider: 'test', requestedModel: 'model-b' }), + ]); + + expect( + screen.getByText('Model changed: model-a (requested) → model-b (requested)') + ).toBeInTheDocument(); + }); + + it('shows a resolved model without the requested label', () => { + renderList([ + assistantWithModel('assistant-1', { + provider: 'test', + requestedModel: 'model-a', + resolvedModel: 'model-a-2026-01-01', + }), + message('user-1', 'user', [{ type: 'text', text: 'Switch model' }]), + assistantWithModel('assistant-2', { provider: 'test', requestedModel: 'model-b' }), + ]); + + expect( + screen.getByText('Model changed: model-a-2026-01-01 → model-b (requested)') + ).toBeInTheDocument(); + }); + + it('does not report a change when only the resolved model is missing', () => { + renderList([ + assistantWithModel('assistant-1', { + provider: 'test', + requestedModel: 'model-a', + resolvedModel: 'model-a-2026-01-01', + }), + message('user-1', 'user', [{ type: 'text', text: 'Continue' }]), + assistantWithModel('assistant-2', { provider: 'test', requestedModel: 'model-a' }), + message('user-2', 'user', [{ type: 'text', text: 'Continue' }]), + assistantWithModel('assistant-3', { + provider: 'test', + requestedModel: 'model-a', + resolvedModel: 'model-a-2026-01-01', + }), + ]); + + expect(screen.queryByText(/Model changed/)).toBeNull(); + }); + + it('compares a resolved model with the last resolved one after a reply without one', () => { + renderList([ + assistantWithModel('assistant-1', { + provider: 'test', + requestedModel: 'model-a', + resolvedModel: 'model-a-2026-01-01', + }), + message('user-1', 'user', [{ type: 'text', text: 'Continue' }]), + assistantWithModel('assistant-2', { provider: 'test', requestedModel: 'model-a' }), + message('user-2', 'user', [{ type: 'text', text: 'Continue' }]), + assistantWithModel('assistant-3', { + provider: 'test', + requestedModel: 'model-a', + resolvedModel: 'model-a-2026-02-01', + }), + ]); + + expect( + screen.getByText('Model changed: model-a-2026-01-01 → model-a-2026-02-01') + ).toBeInTheDocument(); + }); +}); + describe('MessageList transcript window', () => { function messages(count: number): Message[] { return Array.from({ length: count }, (_, index) => diff --git a/ui/desktop/src/components/MessageList.tsx b/ui/desktop/src/components/MessageList.tsx index feb6df382..2cf4fd3a9 100644 --- a/ui/desktop/src/components/MessageList.tsx +++ b/ui/desktop/src/components/MessageList.tsx @@ -18,13 +18,23 @@ import type { SystemNotificationContent, } from '../types/message'; import { getModelDisplayName } from './settings/models/predefinedModelsUtils'; -import { deriveMessageRowContexts, type MessageRowContext } from './messageRowContext'; +import { + deriveMessageRowContexts, + type InferenceModel, + inferenceModel, + isModelChange, + type MessageRowContext, +} from './messageRowContext'; const i18n = defineMessages({ modelChanged: { id: 'messageList.modelChanged', defaultMessage: 'Model changed: {previousModel} → {currentModel}', }, + requestedModel: { + id: 'messageList.requestedModel', + defaultMessage: '{model} (requested)', + }, hiddenMessages: { id: 'messageList.hiddenMessages', defaultMessage: '{count, plural, one {# message hidden} other {# messages hidden}}', @@ -41,11 +51,6 @@ const HEAD_MESSAGE_COUNT = 20; const TAIL_MESSAGE_COUNT = 200; const MESSAGE_DISPLAY_LIMIT = HEAD_MESSAGE_COUNT + TAIL_MESSAGE_COUNT; -function getResolvedModel(message: Message): string | null { - if (message.role !== 'assistant' || !message.metadata.userVisible) return null; - return message.metadata.inference?.resolvedModel ?? null; -} - function getSystemNotification(message: Message): SystemNotificationContent | undefined { return getCreditsExhaustedNotification(message) ?? getInlineSystemNotification(message); } @@ -229,6 +234,10 @@ export default function MessageList({ }, [hasHiddenMessages]); const rowContexts = useMemo(() => deriveMessageRowContexts(messages), [messages]); + const modelLabel = (model: InferenceModel) => + model.confirmed + ? getModelDisplayName(model.id) + : intl.formatMessage(i18n.requestedModel, { model: getModelDisplayName(model.id) }); const messageRows: React.ReactNode[] = []; displayedMessages.forEach(({ message, index }, displayedIndex) => { @@ -256,14 +265,13 @@ export default function MessageList({ ? `notification-${messageIdentifier}` : messageIdentifier; const rowContext = rowContexts[index]; - const currentResolvedModel = getResolvedModel(message); + const currentModel = inferenceModel(message); + const previousModel = rowContext.previousModel; const modelChangeMessage = - currentResolvedModel && - rowContext.previousResolvedModel && - currentResolvedModel !== rowContext.previousResolvedModel + currentModel && previousModel && isModelChange(previousModel, currentModel) ? intl.formatMessage(i18n.modelChanged, { - previousModel: getModelDisplayName(rowContext.previousResolvedModel), - currentModel: getModelDisplayName(currentResolvedModel), + previousModel: modelLabel(previousModel), + currentModel: modelLabel(currentModel), }) : null; const toolNotifications = rowContext.toolStates.map((toolState) => diff --git a/ui/desktop/src/components/messageRowContext.test.ts b/ui/desktop/src/components/messageRowContext.test.ts index e00168cbe..ecee3ea99 100644 --- a/ui/desktop/src/components/messageRowContext.test.ts +++ b/ui/desktop/src/components/messageRowContext.test.ts @@ -1,6 +1,11 @@ import { describe, expect, it } from 'vitest'; import type { Message, MessageContent } from '../types/message'; -import { deriveMessageRowContexts } from './messageRowContext'; +import { + deriveMessageRowContexts, + type InferenceModel, + inferenceModel, + isModelChange, +} from './messageRowContext'; const visibleMetadata: Message['metadata'] = { agentVisible: true, userVisible: true }; @@ -30,6 +35,14 @@ function message( }; } +function messageWithRequestedModel(id: string, requestedModel: string): Message { + const base = message(id, 'assistant', [{ type: 'text', text: id }]); + return { + ...base, + metadata: { ...base.metadata, inference: { provider: 'test', requestedModel } }, + }; +} + function toolRequest(id: string): MessageContent { return { type: 'toolRequest', @@ -131,8 +144,88 @@ describe('deriveMessageRowContexts', () => { const contexts = deriveMessageRowContexts(messages); - expect(contexts[0].previousResolvedModel).toBeNull(); - expect(contexts[1].previousResolvedModel).toBeNull(); - expect(contexts[2].previousResolvedModel).toBe('model-a'); + expect(contexts[0].previousModel).toBeNull(); + expect(contexts[1].previousModel).toBeNull(); + expect(contexts[2].previousModel).toEqual({ + id: 'model-a', + requestedModel: 'model-a', + confirmed: true, + }); + }); + + it('falls back to the requested model when the provider does not report a resolved one', () => { + const messages = [ + messageWithRequestedModel('model-a', 'model-a'), + message('user', 'user', [{ type: 'text', text: 'Switch model' }]), + messageWithRequestedModel('model-b', 'model-b'), + ]; + + const contexts = deriveMessageRowContexts(messages); + + expect(contexts[2].previousModel).toEqual({ + id: 'model-a', + requestedModel: 'model-a', + confirmed: false, + }); + expect(inferenceModel(messages[2])).toEqual({ + id: 'model-b', + requestedModel: 'model-b', + confirmed: false, + }); + }); + + it('keeps the last resolved model across a reply without one', () => { + const resolvedReply = (id: string, resolvedModel: string): Message => { + const base = messageWithRequestedModel(id, 'model-a'); + return { + ...base, + metadata: { + ...base.metadata, + inference: { provider: 'test', requestedModel: 'model-a', resolvedModel }, + }, + }; + }; + const messages = [ + resolvedReply('first', 'model-a-1'), + message('user-1', 'user', [{ type: 'text', text: 'Continue' }]), + messageWithRequestedModel('second', 'model-a'), + message('user-2', 'user', [{ type: 'text', text: 'Continue' }]), + resolvedReply('third', 'model-a-2'), + ]; + + const contexts = deriveMessageRowContexts(messages); + + const firstModel = { id: 'model-a-1', requestedModel: 'model-a', confirmed: true }; + expect(contexts[2].previousModel).toEqual(firstModel); + expect(contexts[4].previousModel).toEqual(firstModel); + }); +}); + +describe('isModelChange', () => { + const resolved = (requestedModel: string, id: string): InferenceModel => ({ + id, + requestedModel, + confirmed: true, + }); + const requested = (requestedModel: string): InferenceModel => ({ + id: requestedModel, + requestedModel, + confirmed: false, + }); + + it('compares resolved models when both replies report one', () => { + expect(isModelChange(resolved('model-a', 'model-a-1'), resolved('model-a', 'model-a-2'))).toBe( + true + ); + expect(isModelChange(resolved('model-a', 'model-a-1'), resolved('model-b', 'model-a-1'))).toBe( + false + ); + }); + + it('compares requested models when a reply has no resolved model', () => { + expect(isModelChange(resolved('model-a', 'model-a-1'), requested('model-a'))).toBe(false); + expect(isModelChange(requested('model-a'), resolved('model-a', 'model-a-1'))).toBe(false); + expect(isModelChange(resolved('model-a', 'model-a-1'), requested('model-b'))).toBe(true); + expect(isModelChange(requested('model-a'), requested('model-b'))).toBe(true); }); }); diff --git a/ui/desktop/src/components/messageRowContext.ts b/ui/desktop/src/components/messageRowContext.ts index 81a5638cf..23dd53f65 100644 --- a/ui/desktop/src/components/messageRowContext.ts +++ b/ui/desktop/src/components/messageRowContext.ts @@ -17,17 +17,49 @@ export interface ToolRenderState { isPending: boolean; } +export interface InferenceModel { + id: string; + requestedModel: string; + /** False when the provider did not report which model served the message. */ + confirmed: boolean; +} + export interface MessageRowContext { hideTimestamp: boolean; isInToolCallChain: boolean; - previousResolvedModel: string | null; + previousModel: InferenceModel | null; toolStates: readonly ToolRenderState[]; toolConfirmationShownInline: boolean; } -function resolvedModel(message: Message): string | null { +export function inferenceModel(message: Message): InferenceModel | null { if (message.role !== 'assistant' || !message.metadata.userVisible) return null; - return message.metadata.inference?.resolvedModel ?? null; + const inference = message.metadata.inference; + if (!inference) return null; + return { + id: inference.resolvedModel || inference.requestedModel, + requestedModel: inference.requestedModel, + confirmed: Boolean(inference.resolvedModel), + }; +} + +// A provider can report the resolved model for one reply and not for the next (for example, +// when its metadata lookup fails), so only two resolved models can be compared with each other. +export function isModelChange(previous: InferenceModel, current: InferenceModel): boolean { + return previous.confirmed && current.confirmed + ? previous.id !== current.id + : previous.requestedModel !== current.requestedModel; +} + +// A reply without a resolved model keeps the last resolved model of the same requested model, +// so a later resolved model is still compared with it. +function keepsPreviousModel(previous: InferenceModel | null, current: InferenceModel): boolean { + return ( + previous !== null && + previous.confirmed && + !current.confirmed && + previous.requestedModel === current.requestedModel + ); } export function deriveMessageRowContexts(messages: Message[]): MessageRowContext[] { @@ -87,12 +119,14 @@ export function deriveMessageRowContexts(messages: Message[]): MessageRowContext } } - let previousResolvedModel: string | null = null; + let previousModel: InferenceModel | null = null; return messages.map((message, messageIndex) => { - const currentResolvedModel = resolvedModel(message); - const rowPreviousResolvedModel = currentResolvedModel ? previousResolvedModel : null; - if (currentResolvedModel) previousResolvedModel = currentResolvedModel; + const currentModel = inferenceModel(message); + const rowPreviousModel = currentModel ? previousModel : null; + if (currentModel && !keepsPreviousModel(previousModel, currentModel)) { + previousModel = currentModel; + } const toolConfirmation = getToolConfirmationContent(message); const confirmationData = getAnyToolConfirmationData(message); @@ -100,7 +134,7 @@ export function deriveMessageRowContexts(messages: Message[]): MessageRowContext return { hideTimestamp: hiddenTimestampIndices.has(messageIndex), isInToolCallChain: chainedMessageIndices.has(messageIndex), - previousResolvedModel: rowPreviousResolvedModel, + previousModel: rowPreviousModel, toolStates: toolStatesByMessageIndex[messageIndex], toolConfirmationShownInline: Boolean( toolConfirmation && confirmationData && toolRequestIds.has(confirmationData.id) diff --git a/ui/desktop/src/i18n/messages/de.json b/ui/desktop/src/i18n/messages/de.json index 2f8657aba..c4bdb9afe 100644 --- a/ui/desktop/src/i18n/messages/de.json +++ b/ui/desktop/src/i18n/messages/de.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Modell geändert: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (angefordert)" + }, "messageList.showAllMessages": { "defaultMessage": "Alle anzeigen" }, diff --git a/ui/desktop/src/i18n/messages/en.json b/ui/desktop/src/i18n/messages/en.json index 99a057a41..4187e56a8 100644 --- a/ui/desktop/src/i18n/messages/en.json +++ b/ui/desktop/src/i18n/messages/en.json @@ -2021,6 +2021,9 @@ "messageList.modelChanged": { "defaultMessage": "Model changed: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (requested)" + }, "messageList.showAllMessages": { "defaultMessage": "Show all" }, diff --git a/ui/desktop/src/i18n/messages/es.json b/ui/desktop/src/i18n/messages/es.json index 47a76278f..fc7cb29e7 100644 --- a/ui/desktop/src/i18n/messages/es.json +++ b/ui/desktop/src/i18n/messages/es.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Modelo cambiado: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (solicitado)" + }, "messageList.showAllMessages": { "defaultMessage": "Mostrar todo" }, diff --git a/ui/desktop/src/i18n/messages/fr.json b/ui/desktop/src/i18n/messages/fr.json index bf0fc1ebe..e620711b6 100644 --- a/ui/desktop/src/i18n/messages/fr.json +++ b/ui/desktop/src/i18n/messages/fr.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Modèle modifié : {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (demandé)" + }, "messageList.showAllMessages": { "defaultMessage": "Tout afficher" }, diff --git a/ui/desktop/src/i18n/messages/hi.json b/ui/desktop/src/i18n/messages/hi.json index 236563d33..508f593d2 100644 --- a/ui/desktop/src/i18n/messages/hi.json +++ b/ui/desktop/src/i18n/messages/hi.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "मॉडल बदला गया: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (अनुरोधित)" + }, "messageList.showAllMessages": { "defaultMessage": "सभी दिखाएँ" }, diff --git a/ui/desktop/src/i18n/messages/id.json b/ui/desktop/src/i18n/messages/id.json index bfe99779a..d027833de 100644 --- a/ui/desktop/src/i18n/messages/id.json +++ b/ui/desktop/src/i18n/messages/id.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Model diubah: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (diminta)" + }, "messageList.showAllMessages": { "defaultMessage": "Tampilkan semua" }, diff --git a/ui/desktop/src/i18n/messages/it.json b/ui/desktop/src/i18n/messages/it.json index c46d9d995..2ab23149f 100644 --- a/ui/desktop/src/i18n/messages/it.json +++ b/ui/desktop/src/i18n/messages/it.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Modello cambiato: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (richiesto)" + }, "messageList.showAllMessages": { "defaultMessage": "Mostra tutto" }, diff --git a/ui/desktop/src/i18n/messages/ja.json b/ui/desktop/src/i18n/messages/ja.json index d6cb27c09..78757b20c 100644 --- a/ui/desktop/src/i18n/messages/ja.json +++ b/ui/desktop/src/i18n/messages/ja.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "モデルを変更しました: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model}(リクエスト済み)" + }, "messageList.showAllMessages": { "defaultMessage": "すべて表示" }, diff --git a/ui/desktop/src/i18n/messages/ko.json b/ui/desktop/src/i18n/messages/ko.json index 8412aa558..fda7f6b4c 100644 --- a/ui/desktop/src/i18n/messages/ko.json +++ b/ui/desktop/src/i18n/messages/ko.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "모델 변경: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (요청됨)" + }, "messageList.showAllMessages": { "defaultMessage": "모두 표시" }, diff --git a/ui/desktop/src/i18n/messages/ms.json b/ui/desktop/src/i18n/messages/ms.json index e7d49e00f..1852c9a62 100644 --- a/ui/desktop/src/i18n/messages/ms.json +++ b/ui/desktop/src/i18n/messages/ms.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Model ditukar: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (diminta)" + }, "messageList.showAllMessages": { "defaultMessage": "Tunjukkan semua" }, diff --git a/ui/desktop/src/i18n/messages/pt.json b/ui/desktop/src/i18n/messages/pt.json index 00c600f06..8f3883c1c 100644 --- a/ui/desktop/src/i18n/messages/pt.json +++ b/ui/desktop/src/i18n/messages/pt.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Modelo alterado: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (solicitado)" + }, "messageList.showAllMessages": { "defaultMessage": "Mostrar tudo" }, diff --git a/ui/desktop/src/i18n/messages/ru.json b/ui/desktop/src/i18n/messages/ru.json index 03801c324..bd9150e81 100644 --- a/ui/desktop/src/i18n/messages/ru.json +++ b/ui/desktop/src/i18n/messages/ru.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Модель изменена: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (запрошенная)" + }, "messageList.showAllMessages": { "defaultMessage": "Показать все" }, diff --git a/ui/desktop/src/i18n/messages/tr.json b/ui/desktop/src/i18n/messages/tr.json index b54280fd4..f91a90c49 100644 --- a/ui/desktop/src/i18n/messages/tr.json +++ b/ui/desktop/src/i18n/messages/tr.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Model değişti: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (istenen)" + }, "messageList.showAllMessages": { "defaultMessage": "Tümünü göster" }, diff --git a/ui/desktop/src/i18n/messages/vi.json b/ui/desktop/src/i18n/messages/vi.json index 0ed0de615..3ead8ca96 100644 --- a/ui/desktop/src/i18n/messages/vi.json +++ b/ui/desktop/src/i18n/messages/vi.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "Mô hình đã thay đổi: {previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (đã yêu cầu)" + }, "messageList.showAllMessages": { "defaultMessage": "Hiển thị tất cả" }, diff --git a/ui/desktop/src/i18n/messages/zh-CN.json b/ui/desktop/src/i18n/messages/zh-CN.json index 1502e6c6a..375169eb5 100644 --- a/ui/desktop/src/i18n/messages/zh-CN.json +++ b/ui/desktop/src/i18n/messages/zh-CN.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "模型已更改:{previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model}(已请求)" + }, "messageList.showAllMessages": { "defaultMessage": "全部显示" }, diff --git a/ui/desktop/src/i18n/messages/zh-TW.json b/ui/desktop/src/i18n/messages/zh-TW.json index 161ab6c60..60c1cec26 100644 --- a/ui/desktop/src/i18n/messages/zh-TW.json +++ b/ui/desktop/src/i18n/messages/zh-TW.json @@ -2639,6 +2639,9 @@ "messageList.modelChanged": { "defaultMessage": "模型已變更:{previousModel} → {currentModel}" }, + "messageList.requestedModel": { + "defaultMessage": "{model} (已請求)" + }, "messageList.showAllMessages": { "defaultMessage": "全部顯示" },