Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: chat provider icons (#6403)

Peter Chinman799b798b0be6
diff --git a/apps/web/src/features/chat/SoupChatInput.test.tsx b/apps/web/src/features/chat/SoupChatInput.test.tsx
index dae39b8481..10b8d91d5d 100644
--- a/apps/web/src/features/chat/SoupChatInput.test.tsx
+++ b/apps/web/src/features/chat/SoupChatInput.test.tsx
@@ -1,3 +1,4 @@
+import { Model } from '@core/component/AI/constant';
import {
cleanup,
fireEvent,
@@ -12,6 +13,9 @@ const mocks = vi.hoisted(() => ({
replace: vi.fn(),
pending: vi.fn(),
rename: vi.fn(),
+ storeModel: vi.fn(),
+ sendBackground: vi.fn(),
+ background: false,
}));
vi.mock('@components/app/split-layout/layoutUtils', () => ({
@@ -32,7 +36,8 @@ vi.mock('@core/component/AI/component/input/ChatInput', () => ({
onClick={() =>
props.onSend({
content: 'Summarize this document',
- model: 'claude-sonnet-5',
+ model: Model.gpt56,
+ metaKey: mocks.background,
attachments: [{ entity_id: 'document-id', entity_type: 'document' }],
})
}
@@ -44,7 +49,7 @@ vi.mock('@core/component/AI/component/input/ChatInput', () => ({
vi.mock('@core/component/AI/context', () => ({
ChatInputProvider: (props: { children: unknown }) => props.children,
useChatInputContext: () => ({
- model: () => 'claude-sonnet-5',
+ model: () => Model.gpt56,
attachments: {},
}),
}));
@@ -60,6 +65,7 @@ vi.mock('@core/component/AI/signal/pendingSend', () => ({
vi.mock('@core/component/AI/util/storage', () => ({
getSoupInputStoredModel: () => undefined,
storeSoupInputModel: vi.fn(),
+ storeChatStateImmediate: mocks.storeModel,
}));
vi.mock('@core/constant/PaywallState', () => ({
PaywallKey: {},
@@ -77,12 +83,18 @@ vi.mock('@entity', () => ({
}));
vi.mock('@queries/soup/cache', () => ({ invalidateAllSoup: vi.fn() }));
vi.mock('@service-cognition/client', () => ({
- cognitionApiServiceClient: { createChat: mocks.createChat },
+ cognitionApiServiceClient: {
+ createChat: mocks.createChat,
+ sendStreamChatMessage: mocks.sendBackground,
+ },
}));
import { SoupChatInput } from './SoupChatInput';
-beforeEach(() => vi.clearAllMocks());
+beforeEach(() => {
+ vi.clearAllMocks();
+ mocks.background = false;
+});
afterEach(cleanup);
describe('SoupChatInput', () => {
@@ -109,12 +121,36 @@ describe('SoupChatInput', () => {
expect(mocks.createChat).toHaveBeenCalledTimes(1);
expect(mocks.pending).toHaveBeenCalledWith({
content: 'Summarize this document',
- model: 'claude-sonnet-5',
+ model: Model.gpt56,
attachments: [{ entity_id: 'document-id', entity_type: 'document' }],
});
expect(mocks.pending.mock.invocationCallOrder[0]).toBeLessThan(
mocks.replace.mock.invocationCallOrder[0]
);
+ expect(mocks.storeModel).toHaveBeenCalledWith('new-chat', {
+ model: Model.gpt56,
+ });
+ expect(mocks.storeModel.mock.invocationCallOrder[0]).toBeLessThan(
+ mocks.rename.mock.invocationCallOrder[0]
+ );
+ });
+ it('records the selected provider for a background send without opening the chat', async () => {
+ mocks.background = true;
+ mocks.createChat.mockResolvedValue({
+ isErr: () => false,
+ value: { id: 'background-chat' },
+ });
+ render(() => <SoupChatInput />);
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ await waitFor(() => expect(mocks.sendBackground).toHaveBeenCalled());
+ expect(mocks.storeModel).toHaveBeenCalledWith('background-chat', {
+ model: Model.gpt56,
+ });
+ expect(mocks.storeModel.mock.invocationCallOrder[0]).toBeLessThan(
+ mocks.sendBackground.mock.invocationCallOrder[0]
+ );
+ expect(mocks.pending).not.toHaveBeenCalled();
+ expect(mocks.replace).not.toHaveBeenCalled();
});
it('does not navigate or queue a message when creation fails', async () => {
mocks.createChat.mockResolvedValue({ isErr: () => true });
@@ -123,5 +159,6 @@ describe('SoupChatInput', () => {
await waitFor(() => expect(mocks.createChat).toHaveBeenCalledTimes(1));
expect(mocks.pending).not.toHaveBeenCalled();
expect(mocks.replace).not.toHaveBeenCalled();
+ expect(mocks.storeModel).not.toHaveBeenCalled();
});
});
diff --git a/apps/web/src/features/chat/SoupChatInput.tsx b/apps/web/src/features/chat/SoupChatInput.tsx
index 7d141370ab..ead41e87f5 100644
--- a/apps/web/src/features/chat/SoupChatInput.tsx
+++ b/apps/web/src/features/chat/SoupChatInput.tsx
@@ -12,6 +12,7 @@ import { setPendingSendData } from '@core/component/AI/signal/pendingSend';
import { deriveChatName } from '@core/component/AI/util/deriveName';
import {
getSoupInputStoredModel,
+ storeChatStateImmediate,
storeSoupInputModel,
} from '@core/component/AI/util/storage';
import { PaywallKey, usePaywallState } from '@core/constant/PaywallState';
@@ -75,6 +76,9 @@ function SoupChatInputInner() {
return;
}
const { id: chatId } = response.value;
+ // Give list/recent icons the sent model before the new chat loads or its
+ // server metadata refreshes, including when sending in the background.
+ storeChatStateImmediate(chatId, { model: request.model });
// Rename via mutation for optimistic cache updates (history, preview, soup)
const name = deriveChatName(request.content);
diff --git a/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx b/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx
index 0650e14808..2f69e0083e 100644
--- a/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx
+++ b/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx
@@ -1,5 +1,4 @@
import { Model } from '@core/component/AI/constant';
-import { resolveChatInputModel } from '@core/component/AI/util/parse';
import { storeChatStateImmediate } from '@core/component/AI/util/storage';
import { cleanup, render } from '@solidjs/testing-library';
import { createSignal } from 'solid-js';
@@ -50,21 +49,38 @@ describe('soup chat provider selection', () => {
).not.toBeNull();
});
- it.each(['gpt-4o', ''])(
- 'matches the composer default for unsupported server model %j',
- async (model) => {
+ it.each(['openai/gpt-5.5', 'gpt-5.5', 'gpt-4o'])(
+ 'keeps the OpenAI logo for historical server model %s',
+ (model) => {
const { container } = render(() => (
<ChatProviderIcon id={`unsupported-model-${model}`} model={model} />
));
- expect(resolveChatInputModel(model)).toBe(Model.sonnet5);
- await vi.waitFor(() =>
- expect(
- container.querySelector('[data-ai-provider="anthropic"] svg')
- ).not.toBeNull()
- );
+ expect(
+ container.querySelector('[data-ai-provider="openai"] svg')
+ ).not.toBeNull();
+ expect(
+ container.querySelector('[data-ai-provider="anthropic"]')
+ ).toBeNull();
}
);
+ it('preserves a historical stored provider when server metadata is missing or still has the default', () => {
+ storeChatStateImmediate('historical-draft', {
+ model: 'openai/gpt-5.5' as Model,
+ });
+ const [model, setModel] = createSignal<string>();
+ const { container } = render(() => (
+ <ChatProviderIcon id="historical-draft" model={model()} />
+ ));
+ expect(
+ container.querySelector('[data-ai-provider="openai"] svg')
+ ).not.toBeNull();
+ setModel(Model.sonnet5);
+ expect(
+ container.querySelector('[data-ai-provider="openai"] svg')
+ ).not.toBeNull();
+ });
+
it('keeps supported OpenAI and Anthropic chats distinct', async () => {
const { container } = render(() => (
<>
@@ -103,9 +119,6 @@ describe('soup chat provider selection', () => {
</>
));
storeChatStateImmediate('selected-chat', { model: Model.sonnet5 });
- expect(resolveChatInputModel(Model.gpt56, Model.sonnet5)).toBe(
- Model.sonnet5
- );
expect(
Array.from(container.querySelectorAll('[data-ai-provider]'), (el) =>
el.getAttribute('data-ai-provider')
@@ -117,7 +130,7 @@ describe('soup chat provider selection', () => {
).toBeNull();
});
- it.each([undefined, null])(
+ it.each([undefined, null, '', 'unknown-provider/model'])(
'shows the standard chat icon when the model is %s',
async (model) => {
const { container } = render(() => (
diff --git a/apps/web/src/features/entity/components/ChatProviderIcon.tsx b/apps/web/src/features/entity/components/ChatProviderIcon.tsx
index fbc8872c38..9cd31453af 100644
--- a/apps/web/src/features/entity/components/ChatProviderIcon.tsx
+++ b/apps/web/src/features/entity/components/ChatProviderIcon.tsx
@@ -1,6 +1,8 @@
-import { ProviderIcon } from '@core/component/AI/component/ProviderIcon';
-import { resolveChatInputModel } from '@core/component/AI/util/parse';
-import { getChatInputStoredModel } from '@core/component/AI/util/storage';
+import {
+ modelProvider,
+ ProviderIcon,
+} from '@core/component/AI/component/ProviderIcon';
+import { getChatStoredModel } from '@core/component/AI/util/storage';
import { EntityIcon } from '@core/component/EntityIcon';
import { Show } from 'solid-js';
@@ -11,23 +13,24 @@ export function ChatProviderIcon(props: {
class?: string;
animate?: boolean;
}) {
- const model = () =>
- getChatInputStoredModel(props.id) ??
- (props.model != null ? resolveChatInputModel(props.model) : undefined);
+ const model = () => {
+ const stored = getChatStoredModel(props.id);
+ // Historical models still identify their provider even after they leave the
+ // picker. Applying the composer's default here would mislabel them as Claude.
+ return modelProvider(stored) ? stored : props.model;
+ };
return (
<Show
- when={model()}
+ when={modelProvider(model())}
fallback={
<EntityIcon targetType="chat" size="fill" class={props.class} />
}
>
- {(model) => (
- <ProviderIcon
- model={model()}
- class={props.class}
- animate={props.animate}
- />
- )}
+ <ProviderIcon
+ model={model()}
+ class={props.class}
+ animate={props.animate}
+ />
</Show>
);
}
diff --git a/apps/web/src/features/home/home-recent-sessions.test.tsx b/apps/web/src/features/home/home-recent-sessions.test.tsx
new file mode 100644
index 0000000000..1d6824a6f6
--- /dev/null
+++ b/apps/web/src/features/home/home-recent-sessions.test.tsx
@@ -0,0 +1,59 @@
+import { cleanup, render, screen } from '@solidjs/testing-library';
+import { afterEach, expect, it, vi } from 'vitest';
+import { RecentSessionsSection } from './home-recent-sessions';
+
+vi.mock('@app/features/next-soup/filters/query-filters', () => ({
+ QUERY_FILTERS_BASE: {},
+}));
+vi.mock('@app/signal/splitLayout', () => ({
+ globalSplitManager: () => undefined,
+}));
+vi.mock('@components/app/split-layout/layoutUtils', () => ({
+ useSplitPanel: () => undefined,
+}));
+vi.mock('@core/component/AI/util/storage', () => ({
+ getChatStoredModel: () => undefined,
+}));
+vi.mock('@core/component/EntityIcon', () => ({
+ EntityIcon: () => <svg data-entity-type="chat" />,
+}));
+vi.mock('@queries/soup/items', () => ({
+ useSoupItemsQuery: () => ({
+ data: [
+ {
+ type: 'chat',
+ id: 'gpt-chat',
+ name: 'GPT conversation',
+ model: 'openai/gpt-5.5',
+ },
+ {
+ type: 'chat',
+ id: 'claude-chat',
+ name: 'Claude conversation',
+ model: 'anthropic/claude-sonnet-5',
+ },
+ { type: 'chat', id: 'unknown-chat', name: 'Unknown conversation' },
+ ],
+ }),
+}));
+
+afterEach(cleanup);
+
+it('uses saved providers for recent chats without requiring a local draft', () => {
+ render(() => <RecentSessionsSection />);
+ expect(
+ screen
+ .getByRole('button', { name: 'GPT conversation' })
+ .querySelector('[data-ai-provider="openai"] svg')
+ ).not.toBeNull();
+ expect(
+ screen
+ .getByRole('button', { name: 'Claude conversation' })
+ .querySelector('[data-ai-provider="anthropic"] svg')
+ ).not.toBeNull();
+ expect(
+ screen
+ .getByRole('button', { name: 'Unknown conversation' })
+ .querySelector('[data-entity-type="chat"]')
+ ).not.toBeNull();
+});
diff --git a/apps/web/src/features/home/home-recent-sessions.tsx b/apps/web/src/features/home/home-recent-sessions.tsx
index cb768c6ee5..00129042e5 100644
--- a/apps/web/src/features/home/home-recent-sessions.tsx
+++ b/apps/web/src/features/home/home-recent-sessions.tsx
@@ -72,7 +72,11 @@ function RecentSessionsContent(props: { limit?: number }) {
class="group flex w-full items-center gap-3.5 rounded-xl border border-edge-muted bg-active px-4 py-3 text-left transition-colors hover:bg-hover"
onClick={() => openChat(session.id)}
>
- <ChatProviderIcon id={session.id} class="size-4 shrink-0" />
+ <ChatProviderIcon
+ id={session.id}
+ model={session.model}
+ class="size-4 shrink-0"
+ />
<span class="flex-1 truncate text-sm font-medium text-ink">
{session.name}
</span>
diff --git a/apps/web/src/lib/core/component/AI/component/input/ChatInput.model.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ChatInput.model.test.tsx
new file mode 100644
index 0000000000..f5e4e9a8e6
--- /dev/null
+++ b/apps/web/src/lib/core/component/AI/component/input/ChatInput.model.test.tsx
@@ -0,0 +1,328 @@
+import { SoupChatInput } from '@app/features/chat/SoupChatInput';
+import { Chat } from '@block-chat/component/Chat';
+import type { ChatData } from '@block-chat/definition';
+import { Model } from '@core/component/AI/constant';
+import {
+ ChatInputProvider,
+ useChatInputContext,
+} from '@core/component/AI/context';
+import { peekPendingSend } from '@core/component/AI/signal/pendingSend';
+import {
+ getChatInputStoredState,
+ getSoupInputStoredModel,
+} from '@core/component/AI/util/storage';
+import type { EditorConfigBuilder } from '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder';
+import {
+ cleanup,
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+ within,
+} from '@solidjs/testing-library';
+import { type JSX, onMount } from 'solid-js';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { ChatInput } from './ChatInput';
+
+const mocks = vi.hoisted(() => ({
+ mobile: true,
+ change: undefined as ((text: string) => void) | undefined,
+ createChat: vi.fn(),
+ replace: vi.fn(),
+ editor: undefined as unknown as EditorConfigBuilder,
+ send: vi.fn(),
+}));
+
+vi.mock('@components/app/split-layout/layoutUtils', () => ({
+ useSplitPanelOrThrow: () => ({ handle: { replace: mocks.replace } }),
+ useCanAutofocusSplitContent: () => false,
+}));
+vi.mock('@block-chat/component/TopBar', () => ({
+ TopBar: () => <CurrentModel />,
+}));
+vi.mock('@block-chat/signal/pendingLocationParams', () => ({
+ pendingLocationParamsSignal: { get: vi.fn(), set: vi.fn() },
+}));
+vi.mock('@components/app/mobile/float-regions/FloatRegion', () => ({
+ FloatRegionOrInline: (props: { children: JSX.Element }) => props.children,
+}));
+vi.mock('@components/app/useNavigatedFromJK', () => ({
+ useNavigatedFromJK: () => ({ navigatedFromJK: () => false }),
+}));
+vi.mock('@core/block', () => ({
+ useBlockId: () => 'selected-first-chat',
+ useIsNestedBlock: () => false,
+}));
+vi.mock('@core/component/AI/component/DragDrop', () => ({
+ DragDropWrapper: (props: { children: JSX.Element }) => props.children,
+}));
+vi.mock('@core/component/AI/component/input/buildRequest', () => ({
+ useSendChatMessage: () => mocks.send,
+}));
+vi.mock('@core/component/AI/component/message/ChatMessages', () => ({
+ ChatMessages: () => null,
+}));
+vi.mock('@core/component/AI/hook/useEntityDropAttachment', () => ({
+ useEntityDropAttachment: () => ({
+ droppable: vi.fn(),
+ isDraggingOver: () => false,
+ }),
+}));
+vi.mock('@core/component/AI/signal/tool', () => ({
+ registerToolHandler: vi.fn(),
+}));
+vi.mock('@core/component/CustomScrollbar', () => ({
+ CustomScrollbar: () => null,
+}));
+vi.mock('@core/hotkey/utils', () => ({ registerScopeSignalHotkey: vi.fn() }));
+vi.mock('@core/orchestrator', () => ({ createMethodRegistration: vi.fn() }));
+vi.mock('@core/signal/blockElement', () => ({
+ blockElementSignal: { get: vi.fn() },
+ blockHotkeyScopeSignal: { get: vi.fn() },
+}));
+vi.mock('@core/signal/load', () => ({ blockHandleSignal: { get: vi.fn() } }));
+vi.mock('@core/signal/permissions', () => ({ useCanEdit: () => () => true }));
+vi.mock('@core/util/message-send-motion', () => ({ markMessageSent: vi.fn() }));
+vi.mock('@queries/auth', () => ({ invalidateUserQuota: vi.fn() }));
+vi.mock('@core/component/AI/component/input/buildChatEditor', () => ({
+ buildChatEditor: () => ({ withMentions: () => mocks.editor }),
+}));
+vi.mock('@core/component/AI/signal/mention-attachment-callbacks', () => ({
+ createMentionAttachmentCallbacks: () => ({}),
+}));
+vi.mock('@core/hotkey/hotkeys', () => ({
+ registerHotkey: vi.fn(),
+ useHotkeyDOMScope: () => [vi.fn()],
+}));
+vi.mock('@core/util/handlePaymentError', () => ({
+ isPaymentError: () => false,
+}));
+vi.mock('@entity', () => ({
+ createRenameDssEntityMutation: () => ({ mutate: vi.fn() }),
+}));
+vi.mock('@queries/soup/cache', () => ({ invalidateAllSoup: vi.fn() }));
+vi.mock('@service-cognition/client', () => ({
+ cognitionApiServiceClient: { createChat: mocks.createChat },
+}));
+
+vi.mock('@app/lib/analytics/analytics-context', () => ({
+ useAnalytics: () => ({ track: vi.fn() }),
+}));
+vi.mock('@core/auth/license', () => ({ useHasPaidAccess: () => () => true }));
+vi.mock('@core/component/AI/signal/attachment', () => ({
+ useAttachments: () => ({ attached: () => [], setAttached: vi.fn() }),
+ useGetChatAttachmentInfo: () => ({}),
+}));
+vi.mock('@core/component/AI/util/uploadToChat', () => ({
+ useUploadAttachment: () => ({ popComplete: () => [], uploading: () => [] }),
+}));
+vi.mock('@core/component/AI/state/createChatController', () => ({
+ createChatController: (chatId: string) => ({
+ chatId: () => chatId,
+ messages: () => [],
+ isGenerating: () => false,
+ stream: () => undefined,
+ dispatch: vi.fn(),
+ }),
+}));
+vi.mock('@core/component/AI/util/chatAttachmentMention', () => ({}));
+vi.mock('@core/component/Toast/Toast', () => ({}));
+vi.mock('@core/constant/allBlocks', () => ({}));
+vi.mock('@core/constant/PaywallState', () => ({
+ usePaywallState: () => ({ showPaywall: vi.fn() }),
+}));
+vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => mocks.mobile }));
+vi.mock('@core/mobile/isTouchDevice', () => ({
+ isTouchDevice: () => mocks.mobile,
+}));
+vi.mock('@core/mobile/isNativeMobilePlatform', () => ({
+ isNativeMobilePlatform: () => false,
+}));
+vi.mock('@core/mobile/virtualKeyboard', () => ({
+ virtualKeyboardVisible: () => true,
+}));
+vi.mock('@core/mobile/useTouchOutsideToDismissKeyboard', () => ({
+ useTouchOutsideToDismissKeyboard: () => {},
+}));
+vi.mock('@core/util/getItemBlockName', () => ({}));
+vi.mock('@core/util/upload', () => ({}));
+vi.mock('@solid-primitives/resize-observer', () => ({
+ createElementSize: () => ({ width: 44, height: 20 }),
+}));
+vi.mock('./Attachment', () => ({ AttachmentList: () => null }));
+vi.mock('./ChatAttachMenu', () => ({ ChatAttachMenu: () => null }));
+vi.mock('./useAiDataConsent', () => ({
+ useAiDataConsentGate: () => ({ ConsentDialog: () => null }),
+}));
+vi.mock('@ui', async () => {
+ const { cn } = await import('@ui/utils/classname');
+ const { Dropdown } = await import('@ui/components/Dropdown');
+ return {
+ cn,
+ Dropdown,
+ ComposerSurface: (props: JSX.HTMLAttributes<HTMLDivElement>) => (
+ <div {...props} />
+ ),
+ Button: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
+ <button {...props} />
+ ),
+ SendButton: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
+ <button aria-label="Send" {...props} />
+ ),
+ };
+});
+
+it('preserves a real soup composer selection when creating and opening its first chat', async () => {
+ mocks.mobile = true;
+ const editor = {
+ withFilePaste: () => editor,
+ onEnter: () => editor,
+ onEscape: () => editor,
+ onChange: (callback: (text: string) => void) => {
+ mocks.change = callback;
+ return editor;
+ },
+ controls: { clear: () => mocks.change?.('') },
+ } as unknown as EditorConfigBuilder;
+ mocks.editor = editor;
+ mocks.createChat.mockResolvedValue({
+ isErr: () => false,
+ value: { id: 'selected-first-chat' },
+ });
+ const composer = render(() => <SoupChatInput />);
+ fireEvent.click(
+ screen.getByRole('button', { name: 'Choose model, Sonnet 5' })
+ );
+ const dialog = await screen.findByRole('dialog', { name: 'Select model' });
+ fireEvent.click(within(dialog).getByRole('button', { name: 'GPT-5.6' }));
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Done' }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+ expect(
+ screen.getByRole('button', { name: 'Choose model, GPT-5.6' })
+ ).toBeTruthy();
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ await waitFor(() => expect(mocks.replace).toHaveBeenCalled());
+ expect(peekPendingSend()?.model).toBe(Model.gpt56);
+ expect(getChatInputStoredState('selected-first-chat').model).toBe(
+ Model.gpt56
+ );
+ expect(getSoupInputStoredModel()).toBe(Model.gpt56);
+ composer.unmount();
+ mocks.send.mockResolvedValue({ error: true });
+ const chat = render(() => (
+ <Chat
+ data={
+ {
+ chat: {
+ id: 'selected-first-chat',
+ model: Model.sonnet5,
+ messages: [],
+ },
+ } as unknown as ChatData
+ }
+ />
+ ));
+ expect(screen.getByTestId('model').textContent).toBe(Model.gpt56);
+ expect(mocks.send).toHaveBeenCalledWith(
+ expect.objectContaining({
+ model: Model.gpt56,
+ chatId: 'selected-first-chat',
+ })
+ );
+ expect(peekPendingSend()).toBeNull();
+ chat.unmount();
+ render(() => <SoupChatInput />);
+ expect(
+ screen.getByRole('button', { name: 'Choose model, GPT-5.6' })
+ ).toBeTruthy();
+});
+vi.mock('@core/component/LexicalMarkdown/builder/MarkdownShell', () => ({
+ MarkdownShell: () => {
+ onMount(() => mocks.change?.('Test first message'));
+ return (
+ <div contentEditable tabIndex={0} role="textbox" aria-label="Prompt">
+ Test first message
+ </div>
+ );
+ },
+}));
+
+let motionStyles: HTMLStyleElement;
+beforeEach(() => {
+ motionStyles = document.createElement('style');
+ motionStyles.textContent =
+ '* { transition-duration: 0s; animation-name: none; }';
+ document.head.append(motionStyles);
+ vi.stubGlobal('scrollTo', vi.fn());
+ vi.stubGlobal(
+ 'ResizeObserver',
+ class {
+ observe() {}
+ unobserve() {}
+ disconnect() {}
+ }
+ );
+});
+afterEach(() => {
+ cleanup();
+ motionStyles.remove();
+ vi.unstubAllGlobals();
+});
+
+function CurrentModel() {
+ const input = useChatInputContext();
+ return <output data-testid="model">{input.model()}</output>;
+}
+
+it.each([true, false])(
+ 'keeps GPT selected through picker dismissal and the first send (mobile=%s)',
+ async (mobile) => {
+ mocks.mobile = mobile;
+ const onSend = vi.fn();
+ const editor = {
+ withFilePaste: () => editor,
+ onEnter: () => editor,
+ onEscape: () => editor,
+ onChange: (callback: (text: string) => void) => {
+ mocks.change = callback;
+ return editor;
+ },
+ controls: { clear: () => mocks.change?.('') },
+ } as unknown as EditorConfigBuilder;
+ render(() => (
+ <ChatInputProvider>
+ <CurrentModel />
+ <ChatInput variant="default" editor={editor} onSend={onSend} />
+ </ChatInputProvider>
+ ));
+ const trigger = mobile
+ ? screen.getByRole('button', { name: 'Choose model, Sonnet 5' })
+ : screen.getByRole('button', { name: 'Sonnet 5' });
+ if (mobile) fireEvent.click(trigger);
+ else fireEvent.keyDown(trigger, { key: 'ArrowDown' });
+ if (mobile) {
+ const dialog = await screen.findByRole('dialog', {
+ name: 'Select model',
+ });
+ fireEvent.click(within(dialog).getByRole('button', { name: 'GPT-5.6' }));
+ expect(screen.getByTestId('model').textContent).toBe(Model.gpt56);
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Done' }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+ } else {
+ fireEvent.keyDown(
+ await screen.findByRole('menuitem', { name: 'GPT-5.6' }),
+ { key: 'Enter' }
+ );
+ await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
+ }
+ expect(screen.getByTestId('model').textContent).toBe(Model.gpt56);
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ expect(onSend).toHaveBeenCalledWith(
+ expect.objectContaining({
+ model: Model.gpt56,
+ content: 'Test first message',
+ })
+ );
+ expect(screen.getByTestId('model').textContent).toBe(Model.gpt56);
+ }
+);
diff --git a/apps/web/src/lib/core/component/AI/util/storage.test.ts b/apps/web/src/lib/core/component/AI/util/storage.test.ts
index d6a4db7ade..7e407f4ebd 100644
--- a/apps/web/src/lib/core/component/AI/util/storage.test.ts
+++ b/apps/web/src/lib/core/component/AI/util/storage.test.ts
@@ -3,9 +3,10 @@
*/
import { beforeEach, describe, expect, it } from 'vitest';
import { DEFAULT_MODEL, Model } from '../constant';
+import { resolveChatInputModel } from './parse';
import {
- getChatInputStoredModel,
getChatInputStoredState,
+ getChatStoredModel,
storeChatStateImmediate,
} from './storage';
@@ -20,7 +21,7 @@ describe('chat input storage: model defaults', () => {
const restored = getChatInputStoredState('chat-a');
expect(restored.model).toBe(Model.gpt56);
expect(restored.input).toBe('draft');
- expect(getChatInputStoredModel('chat-a')).toBe(Model.gpt56);
+ expect(getChatStoredModel('chat-a')).toBe(Model.gpt56);
});
it('keeps each chat on its own remembered model', () => {
@@ -32,23 +33,35 @@ describe('chat input storage: model defaults', () => {
});
it('returns no stored model for a chat that has never been used', () => {
- expect(getChatInputStoredModel('never-seen')).toBeUndefined();
+ expect(getChatStoredModel('never-seen')).toBeUndefined();
expect(getChatInputStoredState('never-seen').model).toBeUndefined();
});
- it('defaults a draft without a model only when restoring composer state', () => {
+ it('lets the server model win when a saved draft has no model', () => {
storeChatStateImmediate('input-only', { input: 'draft' });
- expect(getChatInputStoredModel('input-only')).toBeUndefined();
- expect(getChatInputStoredState('input-only').model).toBe(DEFAULT_MODEL);
- expect(getChatInputStoredModel('input-only')).toBeUndefined();
+ const restored = getChatInputStoredState('input-only');
+ expect(restored.model).toBeUndefined();
+ expect(resolveChatInputModel(Model.gpt56, restored.model)).toBe(
+ Model.gpt56
+ );
+ expect(resolveChatInputModel(undefined, restored.model)).toBe(
+ DEFAULT_MODEL
+ );
+ expect(getChatStoredModel('input-only')).toBeUndefined();
});
- it('falls back to the default model when the persisted value is stale/unknown', () => {
- // A model id that is no longer valid (e.g. left over from a previous build).
+ it('preserves a historical provider for icons without selecting an unavailable model', () => {
storeChatStateImmediate('chat-c', {
- model: 'anthropic/claude-opus-4-7' as Model,
+ model: 'openai/gpt-5.5' as Model,
});
- expect(getChatInputStoredModel('chat-c')).toBeUndefined();
- expect(getChatInputStoredState('chat-c').model).toBe(DEFAULT_MODEL);
+ const restored = getChatInputStoredState('chat-c');
+ expect(restored.model).toBeUndefined();
+ expect(getChatStoredModel('chat-c')).toBe('openai/gpt-5.5');
+ expect(resolveChatInputModel(Model.gpt56, restored.model)).toBe(
+ Model.gpt56
+ );
+ expect(resolveChatInputModel(undefined, restored.model)).toBe(
+ DEFAULT_MODEL
+ );
});
});
diff --git a/apps/web/src/lib/core/component/AI/util/storage.ts b/apps/web/src/lib/core/component/AI/util/storage.ts
index 0e1ff69aa1..1e4ffa63fd 100644
--- a/apps/web/src/lib/core/component/AI/util/storage.ts
+++ b/apps/web/src/lib/core/component/AI/util/storage.ts
@@ -2,7 +2,6 @@ import type { Attachment, Model } from '@core/component/AI/types';
import { makePersisted } from '@solid-primitives/storage';
import { createSignal, untrack } from 'solid-js';
import { createStore, reconcile } from 'solid-js/store';
-import { DEFAULT_MODEL } from '../constant';
import { parseModel } from './parse';
export type StoredStuff = {
@@ -68,17 +67,17 @@ export function storeChatStateImmediate(
setPersistentChatState(id, { ...state, used_at: Date.now() });
}
-/** Reactive read for list icons; does not touch the draft's LRU timestamp. */
-export function getChatInputStoredModel(id: string): Model | undefined {
- const stored = persistentChatState[id];
- return parseModel(stored?.model);
+/** Reactive model identity for icons, including models no longer in the picker. */
+export function getChatStoredModel(id: string): string | undefined {
+ return persistentChatState[id]?.model;
}
export function getChatInputStoredState(id: string): Partial<StoredStuff> {
const storedStuff = untrack(() => persistentChatState[id]);
if (!storedStuff) return {};
- const model = untrack(() => getChatInputStoredModel(id)) ?? DEFAULT_MODEL;
+ // Let the composer try the server model before applying its default.
+ const model = untrack(() => parseModel(getChatStoredModel(id)));
setPersistentChatState(id, { ...storedStuff, used_at: Date.now() });
return {
...storedStuff,
diff --git a/crates/agent_inmem/src/domain/agent.rs b/crates/agent_inmem/src/domain/agent.rs
index 8d7342095a..b607597fca 100644
--- a/crates/agent_inmem/src/domain/agent.rs
+++ b/crates/agent_inmem/src/domain/agent.rs
@@ -540,7 +540,9 @@ pub async fn serve(state: Arc<AgentState>, acp: AcpChannel) -> Result<(), AcpErr
// `domain::replay`).
state.bind_acp_session(request.session_id, true);
state.connect_mcp(request.mcp_servers).await;
- responder.respond(ResumeSessionResponse::new())
+ responder.respond(
+ ResumeSessionResponse::new().config_options(state.model_config_options()),
+ )
}
},
agent_client_protocol::on_receive_request!(),
@@ -638,7 +640,9 @@ pub async fn serve(state: Arc<AgentState>, acp: AcpChannel) -> Result<(), AcpErr
);
};
state.set_model(model.to_string());
- responder.respond(SetSessionConfigOptionResponse::new(Vec::new()))
+ responder.respond(SetSessionConfigOptionResponse::new(
+ state.model_config_options(),
+ ))
}
},
agent_client_protocol::on_receive_request!(),
diff --git a/crates/agent_inmem/src/domain/agent/test.rs b/crates/agent_inmem/src/domain/agent/test.rs
index 103a877d8b..7862d6c627 100644
--- a/crates/agent_inmem/src/domain/agent/test.rs
+++ b/crates/agent_inmem/src/domain/agent/test.rs
@@ -1025,4 +1025,5 @@ async fn ask_without_form_support_explains_instead_of_asking() {
);
}
+mod model_selection;
mod telemetry;
diff --git a/crates/agent_inmem/src/domain/agent/test/model_selection.rs b/crates/agent_inmem/src/domain/agent/test/model_selection.rs
new file mode 100644
index 0000000000..551145794e
--- /dev/null
+++ b/crates/agent_inmem/src/domain/agent/test/model_selection.rs
@@ -0,0 +1,68 @@
+use super::*;
+use agent_fold::domain::model_selection::model_selection;
+
+const SELECTED_MODEL: &str = "other-model";
+
+#[tokio::test]
+async fn model_change_advertises_the_model_used_by_the_first_prompt() {
+ let engine = Arc::new(ScriptedEngine::new(vec![]));
+ let (_, initial_config, changed_config) =
+ with_agent(Arc::clone(&engine), async |connection, session| {
+ let changed = connection
+ .send_request(SetSessionConfigOptionRequest::new(
+ session.clone(),
+ MODEL_CONFIG_ID,
+ SELECTED_MODEL,
+ ))
+ .block_task()
+ .await
+ .expect("the model change should succeed");
+ connection
+ .send_request(text_prompt(&session, "first prompt"))
+ .block_task()
+ .await
+ .expect("the first prompt should complete");
+ changed.config_options
+ })
+ .await;
+
+ let initial = model_selection(&initial_config).expect("the initial model is advertised");
+ let changed = model_selection(&changed_config)
+ .expect("the accepted change must advertise its model to the UI and session projection");
+ assert_eq!(changed.current, SELECTED_MODEL);
+ assert_eq!(changed.options, initial.options);
+ assert_eq!(engine.requests()[0].model, changed.current);
+}
+
+#[tokio::test]
+async fn resume_advertises_the_current_model_without_resetting_it() {
+ let engine = Arc::new(ScriptedEngine::new(vec![]));
+ let (_, _, resumed_config) = with_agent(Arc::clone(&engine), async |connection, session| {
+ connection
+ .send_request(SetSessionConfigOptionRequest::new(
+ session.clone(),
+ MODEL_CONFIG_ID,
+ SELECTED_MODEL,
+ ))
+ .block_task()
+ .await
+ .expect("the model change should succeed");
+ let resumed = connection
+ .send_request(ResumeSessionRequest::new(session.clone(), "/"))
+ .block_task()
+ .await
+ .expect("the session should resume");
+ connection
+ .send_request(text_prompt(&session, "after resume"))
+ .block_task()
+ .await
+ .expect("the resumed prompt should complete");
+ resumed.config_options.unwrap_or_default()
+ })
+ .await;
+
+ let resumed = model_selection(&resumed_config)
+ .expect("resume must report the current model even if earlier metadata was stale");
+ assert_eq!(resumed.current, SELECTED_MODEL);
+ assert_eq!(engine.requests()[0].model, resumed.current);
+}
diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.md
index ca719bbb71..a2e44685a7 100644
--- a/docs/AGENT_GUIDE/ai-chat.md
+++ b/docs/AGENT_GUIDE/ai-chat.md
@@ -336,6 +336,11 @@ saved local draft selection taking precedence. Icons do not query chat transcrip
Rows without model data show the standard chat icon. Claude models use the Claude sunburst logo; OpenAI and Google use their
provider logos; unknown providers in chat titles reserve the icon space.
+For a Macro agent session, changing the model must settle on the selected model
+and update the title's provider logo. Check this with an OpenAI override when
+starting a session and when changing an existing session before its first prompt.
+Reopening or resuming the session must retain that selection and logo.
+
Both AI composers display their model trigger label at the input text size
(15px), using the softer secondary text color. This includes the agent model
catalog trigger and mobile model sheet trigger.