Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(ai): offer Sonnet 5.5 and Opus 5.5 while keeping Haiku 4.5 (#7386)
Wolf Mermelsteinfe764a35c6fa
diff --git a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx b/apps/web/src/features/agents-view/components/ModelSelector.test.tsxindex 389e1df7d2..78ddf3f02f 100644--- a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx+++ b/apps/web/src/features/agents-view/components/ModelSelector.test.tsx@@ -13,12 +13,6 @@ import { ModelSelector, SessionModelSelector } from './ModelSelector';const options = [{ id: 'gpt-5', name: 'GPT-5', description: null, group: null },{ id: 'claude-sonnet-4', name: 'Sonnet 4', description: null, group: null },- {- id: 'anthropic/claude-fable-5-1',- name: 'Fable 5.1',- description: null,- group: null,- },];describe('shared model selector', () => {@@ -49,7 +43,6 @@ describe('shared model selector', () => {));const trigger = screen.getByRole('button', { name: 'Model' });fireEvent.keyDown(trigger, { key: 'Enter' });- expect(screen.queryByRole('menuitem', { name: /Fable 5.1/ })).toBeNull();fireEvent.keyDown(screen.getByRole('menuitem', { name: /Sonnet 4/ }), {key: 'Enter',});@@ -86,9 +79,9 @@ describe('shared model selector', () => {const select = vi.fn();const [changingTo, setChangingTo] = createSignal<string>();const ids = [- 'anthropic/claude-sonnet-5',- 'anthropic/claude-opus-5',- 'anthropic/claude-haiku-4-5',+ 'anthropic/claude-sonnet-5-5',+ 'anthropic/claude-opus-5-5',+ 'openai/gpt-5.6-mini',];render(() => (<SessionModelSelector@@ -104,18 +97,20 @@ describe('shared model selector', () => {/>));const trigger = screen.getByRole('button', { name: 'Model' });- expect(trigger.textContent).toBe('Sonnet 5');- expect(trigger.title).toBe('Sonnet 5');+ expect(trigger.textContent).toBe('Sonnet 5.5');+ expect(trigger.title).toBe('Sonnet 5.5');fireEvent.keyDown(trigger, { key: 'Enter' });- expect(screen.getByRole('menuitem', { name: /^Haiku 4.5/ })).toBeTruthy();+ expect(+ screen.getByRole('menuitem', { name: /^GPT-5.6 mini/ })+ ).toBeTruthy();expect(screen.queryByText(ids[0])).toBeNull();- fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Opus 5/ }), {+ fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Opus 5.5/ }), {key: 'Enter',});expect(select).toHaveBeenCalledWith(ids[1]);await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());setChangingTo(ids[1]);- expect(trigger.textContent).toBe('Opus 5');+ expect(trigger.textContent).toBe('Opus 5.5');});it('keeps the new-session default selectable before models are available', async () => {const selectDefault = vi.fn();diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsxindex 04af5e847a..35f0262497 100644--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx@@ -3,7 +3,6 @@ import {ModelCatalogPicker,type ModelRowProps,} from '@core/component/AI/component/input/ModelCatalogPicker';-import { isModelPickerOption } from '@core/component/AI/constant/model';import { modelLabel } from '@core/component/AI/constant/model-label';import type { Component, JSX } from 'solid-js';@@ -29,14 +28,12 @@ export function ModelSelector(props: {return (<ModelCatalogPickervalue={props.model ?? null}- options={props.options- .filter((option) => isModelPickerOption(option.id))- .map((option) => ({- id: option.id,- label: modelLabel(option.id, option.name),- description: option.description,- group: option.group,- }))}+ options={props.options.map((option) => ({+ id: option.id,+ label: modelLabel(option.id, option.name),+ description: option.description,+ group: option.group,+ }))}triggerLabel={props.label}placeholder={modelLabel(props.model)}triggerClass="h-[33.75px] min-w-0 max-w-full gap-[5.625px] rounded-full border-0 bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder [&_svg]:size-[15px]"diff --git a/apps/web/src/features/agents-view/queries/composer-models.test.ts b/apps/web/src/features/agents-view/queries/composer-models.test.tsindex 2db0cd390c..af7bab5c43 100644--- a/apps/web/src/features/agents-view/queries/composer-models.test.ts+++ b/apps/web/src/features/agents-view/queries/composer-models.test.ts@@ -69,10 +69,7 @@ describe('composer model discovery', () => {it('does not read pending resource data and exposes discovered choices when ready', () => {createRoot((dispose) => {const [ready, setReady] = createSignal(false);- const models = [- { id: 'runtime-model', name: 'Runtime model' },- { id: 'anthropic/claude-fable-5-1', name: 'Fable 5.1' },- ];+ const models = [{ id: 'runtime-model', name: 'Runtime model' }];discovery.query = {get isSuccess() {return ready();@@ -104,7 +101,7 @@ describe('composer model discovery', () => {expect(source.models()).toEqual([]);expect(source.message()).toBe('Loading models…');setReady(true);- expect(source.models()).toEqual([models[0]]);+ expect(source.models()).toEqual(models);expect(source.currentModel()).toBe('runtime-model');dispose();});diff --git a/apps/web/src/features/agents-view/queries/composer-models.ts b/apps/web/src/features/agents-view/queries/composer-models.tsindex c748919e5b..a170c66623 100644--- a/apps/web/src/features/agents-view/queries/composer-models.ts+++ b/apps/web/src/features/agents-view/queries/composer-models.ts@@ -1,4 +1,3 @@-import { isModelPickerOption } from '@core/component/AI/constant/model';import {type AgentModelTarget,useAgentModelsQuery,@@ -53,8 +52,7 @@ export function createComposerModels(agent: Accessor<RosterAgent | undefined>) {);const data = () => (target() && query.isSuccess ? query.data : undefined);return {- models: () =>- data()?.models.filter((model) => isModelPickerOption(model.id)) ?? [],+ models: () => data()?.models ?? [],currentModel: () => data()?.currentModel ?? undefined,message: () => {if (!agent()?.runtime.connected)diff --git a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx b/apps/web/src/features/agents-view/views/NewChatPage.test.tsxindex 6be316cfc9..eb4a8c08c4 100644--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx@@ -135,14 +135,10 @@ vi.mock('@queries/agents/models', () => ({{ id: 'chat-default', name: 'Chat default' },{ id: 'claude-sonnet-4', name: 'Sonnet 4' },{- id: 'anthropic/claude-fable-5-1',- name: 'Fable 5.1',+ id: 'anthropic/claude-sonnet-5-5',+ name: 'anthropic/claude-sonnet-5-5',},- {- id: 'anthropic/claude-sonnet-5',- name: 'anthropic/claude-sonnet-5',- },- { id: 'anthropic/claude-opus-5', name: 'Claude Opus 5' },+ { id: 'anthropic/claude-opus-5-5', name: 'Claude Opus 5.5' },{ id: 'openai/gpt-5.6', name: 'GPT-5.6' },{ id: 'google/gemini-3.8-flash', name: 'Gemini 3.8 Flash' },{ id: 'fireworks/kimi-k3', name: 'Kimi K3' },@@ -322,16 +318,16 @@ describe('agent-led new conversation', () => {fireEvent.input(await screen.findByRole('textbox', { name: 'Search agents and models' }),{- target: { value: 'Sonnet 5' },+ target: { value: 'Sonnet 5.5' },});expect(screen.queryByRole('button', { name: 'Chat default' })).toBeNull();- fireEvent.click(screen.getByRole('button', { name: 'Sonnet 5' }));+ fireEvent.click(screen.getByRole('button', { name: 'Sonnet 5.5' }));await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());fireEvent.click(screen.getByRole('button', { name: 'Send' }));expect(send).toHaveBeenCalledWith(expect.objectContaining({- modelOverride: 'anthropic/claude-sonnet-5',+ modelOverride: 'anthropic/claude-sonnet-5-5',}));});@@ -595,12 +591,12 @@ describe('agent-led new conversation', () => {it('clears a temporary model choice when selecting another agent', async () => {page();openAgents();- const model = screen.getByTitle('Sonnet 5');+ const model = screen.getByTitle('Sonnet 5.5');model.focus();fireEvent.keyDown(model, { key: 'Enter' });await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(- 'Sonnet 5'+ 'Sonnet 5.5');await selectAgent(/Cursor/);expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(@@ -642,23 +638,22 @@ describe('agent-led new conversation', () => {expect(models.queryByRole('menuitem', { name: /Cursor default|GPT-5/ })).toBeNull();- expect(models.queryByRole('menuitem', { name: /Fable 5.1/ })).toBeNull();- const sonnet = models.getByTitle('Sonnet 5');+ const sonnet = models.getByTitle('Sonnet 5.5');expect(sonnet.querySelector('[data-ai-provider="anthropic"] svg')).toBeTruthy();- expect(screen.queryByText('anthropic/claude-sonnet-5')).toBeNull();+ expect(screen.queryByText('anthropic/claude-sonnet-5-5')).toBeNull();sonnet.focus();fireEvent.keyDown(sonnet, { key: 'Enter' });await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());expect(mocks.rememberInmemModel).toHaveBeenCalledWith(- 'anthropic/claude-sonnet-5'+ 'anthropic/claude-sonnet-5-5');expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(- 'Sonnet 5'+ 'Sonnet 5.5');const trigger = screen.getByRole('button', { name: 'Agent' });- expect(trigger.title).toBe('Sonnet 5');+ expect(trigger.title).toBe('Sonnet 5.5');expect(trigger.querySelector('[data-ai-provider="anthropic"] svg')).toBeTruthy();@@ -668,15 +663,15 @@ describe('agent-led new conversation', () => {prompt: 'Prompt',botId: undefined,repoUrl: undefined,- modelOverride: 'anthropic/claude-sonnet-5',+ modelOverride: 'anthropic/claude-sonnet-5-5',});// Macro Models picks stick: a second send still uses the preferred model.expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(- 'Sonnet 5'+ 'Sonnet 5.5');fireEvent.click(screen.getByRole('button', { name: 'Send' }));expect(send.mock.calls[1][0]).toMatchObject({- modelOverride: 'anthropic/claude-sonnet-5',+ modelOverride: 'anthropic/claude-sonnet-5-5',});});it('keeps unavailable Macro models disabled throughout the catalog', async () => {@@ -703,7 +698,7 @@ describe('agent-led new conversation', () => {/>));openAgents();- const sonnet = screen.getByTitle('Sonnet 5');+ const sonnet = screen.getByTitle('Sonnet 5.5');expect(sonnet.getAttribute('aria-disabled')).toBe('true');fireEvent.click(sonnet);fireEvent.keyDown(sonnet, { key: 'Enter' });@@ -724,10 +719,10 @@ describe('agent-led new conversation', () => {expect(onSelect).not.toHaveBeenCalled();});it('restores a preferred Macro model on a fresh composer', () => {- mocks.preferredInmemModel = 'anthropic/claude-sonnet-5';+ mocks.preferredInmemModel = 'anthropic/claude-sonnet-5-5';page();expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(- 'Sonnet 5'+ 'Sonnet 5.5');});it('restores the most recently used supported agent', async () => {diff --git a/apps/web/src/features/block-agent/component/compose-agent-session-options.ts b/apps/web/src/features/block-agent/component/compose-agent-session-options.tsindex 523eb7739f..b30f971ff3 100644--- a/apps/web/src/features/block-agent/component/compose-agent-session-options.ts+++ b/apps/web/src/features/block-agent/component/compose-agent-session-options.ts@@ -104,7 +104,7 @@ export function showsSessionHarness(session: {/*** A model's display name. Runtimes that keep no name for a model report its* slug as the name, so the house label reads the id instead of showing- * `claude-sonnet-5` where the rest of the app says "Sonnet 5".+ * `claude-sonnet-5-5` where the rest of the app says "Sonnet 5.5".*/export function modelDisplayName(id: string,diff --git a/apps/web/src/features/block-agent/debug/Gallery.tsx b/apps/web/src/features/block-agent/debug/Gallery.tsxindex 427aead5ac..924e82ed0a 100644--- a/apps/web/src/features/block-agent/debug/Gallery.tsx+++ b/apps/web/src/features/block-agent/debug/Gallery.tsx@@ -118,8 +118,8 @@ const FIXTURE_MODELS: ModelOption[] = [* every option arrives named after its own slug.*/const FIXTURE_INMEM_MODELS: ModelOption[] = [- 'anthropic/claude-sonnet-5',- 'anthropic/claude-opus-5',+ 'anthropic/claude-sonnet-5-5',+ 'anthropic/claude-opus-5-5','anthropic/claude-haiku-4-5','openai/gpt-5.5','openai/gpt-5-mini',diff --git a/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx b/apps/web/src/features/entity/components/ChatProviderIcon.test.tsxindex 2f69e0083e..caacdd4b47 100644--- a/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx+++ b/apps/web/src/features/entity/components/ChatProviderIcon.test.tsx@@ -34,7 +34,7 @@ describe('soup chat provider selection', () => {expect(container.querySelector('[data-ai-provider="openai"]')).not.toBeNull();- setModel(Model.sonnet5);+ setModel(Model.sonnet55);expect(container.querySelector('[data-ai-provider="anthropic"]')).not.toBeNull();@@ -42,7 +42,7 @@ describe('soup chat provider selection', () => {});it('uses a saved selection without a saved soup model', async () => {- storeChatStateImmediate('draft-only', { model: Model.sonnet5 });+ storeChatStateImmediate('draft-only', { model: Model.sonnet55 });const { container } = render(() => <ChatProviderIcon id="draft-only" />);expect(container.querySelector('[data-ai-provider="anthropic"]')@@ -75,7 +75,7 @@ describe('soup chat provider selection', () => {expect(container.querySelector('[data-ai-provider="openai"] svg')).not.toBeNull();- setModel(Model.sonnet5);+ setModel(Model.sonnet55);expect(container.querySelector('[data-ai-provider="openai"] svg')).not.toBeNull();@@ -85,7 +85,7 @@ describe('soup chat provider selection', () => {const { container } = render(() => (<><ChatProviderIcon id="openai-chat" model={Model.gpt56} />- <ChatProviderIcon id="anthropic-chat" model={Model.opus5} />+ <ChatProviderIcon id="anthropic-chat" model={Model.opus55} /></>));expect(@@ -118,7 +118,7 @@ describe('soup chat provider selection', () => {<ChatProviderIcon id="other-chat" model={Model.gpt56} /></>));- storeChatStateImmediate('selected-chat', { model: Model.sonnet5 });+ storeChatStateImmediate('selected-chat', { model: Model.sonnet55 });expect(Array.from(container.querySelectorAll('[data-ai-provider]'), (el) =>el.getAttribute('data-ai-provider')diff --git a/apps/web/src/features/home/home-chat-input.test.tsx b/apps/web/src/features/home/home-chat-input.test.tsxindex 87baa672d2..0d7c7b16c2 100644--- a/apps/web/src/features/home/home-chat-input.test.tsx+++ b/apps/web/src/features/home/home-chat-input.test.tsx@@ -81,7 +81,7 @@ vi.mock('@service-cognition/client', () => ({const request: ChatSendInput = {content: 'Summarize **these documents**\nInclude the key decisions.',- model: Model.sonnet5,+ model: Model.sonnet55,attachments: [{ entity_id: 'document-1', entity_type: 'document' },{ entity_id: 'project-1', entity_type: 'project' },diff --git a/apps/web/src/features/settings/Agents.test.tsx b/apps/web/src/features/settings/Agents.test.tsxindex 76ca2480c0..704a3f3296 100644--- a/apps/web/src/features/settings/Agents.test.tsx+++ b/apps/web/src/features/settings/Agents.test.tsx@@ -318,8 +318,8 @@ beforeEach(() => {);modelMocks.queries = {'in-memory:': successfulModels([- { id: Model.sonnet5, name: 'Claude Sonnet 4.5' },- { id: Model.opus5, name: 'Claude Opus 4.5' },+ { id: Model.sonnet55, name: 'Claude Sonnet 4.5' },+ { id: Model.opus55, name: 'Claude Opus 4.5' },]),};});@@ -532,7 +532,7 @@ describe('Agents', () => {expect.objectContaining({agentId: 'agent-1',harness: 'in-memory',- defaultModel: Model.sonnet5,+ defaultModel: Model.sonnet55,})));@@ -580,7 +580,7 @@ describe('Agents', () => {},instructions: 'Fix the root cause.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'all',channel_ids: [],},@@ -598,7 +598,7 @@ describe('Agents', () => {},instructions: 'Keep releases moving.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'selected',channel_ids: ['channel-engineering'],},@@ -646,7 +646,7 @@ describe('Agents', () => {},instructions: 'Review pull requests.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'selected',channel_ids: ['channel-engineering'],},@@ -673,7 +673,7 @@ describe('Agents', () => {},instructions: 'Help the other team.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'selected',channel_ids: ['channel-engineering'],},@@ -699,7 +699,7 @@ describe('Agents', () => {},instructions: 'Help the team.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'all',channel_ids: [],};@@ -805,7 +805,7 @@ describe('Agents', () => {},instructions: 'Fix the root cause.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'selected',channel_ids: ['channel-engineering'],},@@ -844,7 +844,7 @@ describe('Agents', () => {avatarUrl: undefined,channelIds: ['channel-engineering'],channelScope: 'selected',- defaultModel: Model.sonnet5,+ defaultModel: Model.sonnet55,description: 'Finds and fixes bugs.',handle: 'bug-fixer',harness: 'in-memory',@@ -875,7 +875,7 @@ describe('Agents', () => {},instructions: 'Fix the root cause.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'all',channel_ids: [],},@@ -920,7 +920,7 @@ describe('Agents', () => {},instructions: 'Fix the root cause.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'all',channel_ids: [],},@@ -959,7 +959,7 @@ describe('Agents', () => {},instructions: 'Fix the root cause.',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'selected',channel_ids: ['channel-engineering'],},@@ -1071,7 +1071,7 @@ describe('Agents', () => {isCoding: false,channelIds: [],channelScope: 'all',- defaultModel: Model.sonnet5,+ defaultModel: Model.sonnet55,handle: 'bug-fixer',harness: 'in-memory',name: 'Bug fixer',@@ -1546,7 +1546,7 @@ describe('Agents', () => {},instructions: '',harness: 'in-memory',- default_model: Model.sonnet5,+ default_model: Model.sonnet55,channel_scope: 'all',channel_ids: [],mcp: {diff --git a/apps/web/src/features/settings/Agents.tsx b/apps/web/src/features/settings/Agents.tsxindex 789cd2ccb7..3a838ac6df 100644--- a/apps/web/src/features/settings/Agents.tsx+++ b/apps/web/src/features/settings/Agents.tsx@@ -98,7 +98,7 @@ const MACRO_AGENT: AgentSummary = {tag: 'macro',instructions: '',harness: MACRO_HARNESS_NAME,- defaultModel: MODEL_PRETTYNAME[Model.sonnet5],+ defaultModel: MODEL_PRETTYNAME[Model.sonnet55],channelSummary: 'All channels',share: 'Team',};diff --git a/apps/web/src/lib/core/component/AI/component/debug/Component.tsx b/apps/web/src/lib/core/component/AI/component/debug/Component.tsxindex 80a1e69b2c..9845d31ee4 100644--- a/apps/web/src/lib/core/component/AI/component/debug/Component.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/Component.tsx@@ -486,7 +486,7 @@ function ProviderFailureChat() {return (<ProviderFailureDemolabel="Provider failure - switch-model fallback"- initialModel={Model.opus5}+ initialModel={Model.opus55}availableModels={GALLERY_MODELS}/>);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.tsxindex 923f667f3d..fd3f8fcca3 100644--- 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@@ -213,7 +213,7 @@ it('preserves a real soup composer selection when creating and opening its first});const composer = render(() => <SoupChatInput />);fireEvent.click(- screen.getByRole('button', { name: 'Choose model, Sonnet 5' })+ screen.getByRole('button', { name: 'Choose model, Sonnet 5.5' }));const dialog = await screen.findByRole('dialog', { name: 'Select model' });fireEvent.click(within(dialog).getByRole('button', { name: 'GPT-5.6' }));@@ -237,7 +237,7 @@ it('preserves a real soup composer selection when creating and opening its first{chat: {id: 'selected-first-chat',- model: Model.sonnet5,+ model: Model.sonnet55,messages: [],},} as unknown as ChatData@@ -319,8 +319,8 @@ it.each([true, false])(</ChatInputProvider>));const trigger = mobile- ? screen.getByRole('button', { name: 'Choose model, Sonnet 5' })- : screen.getByRole('button', { name: 'Sonnet 5' });+ ? screen.getByRole('button', { name: 'Choose model, Sonnet 5.5' })+ : screen.getByRole('button', { name: 'Sonnet 5.5' });if (mobile) fireEvent.click(trigger);else fireEvent.keyDown(trigger, { key: 'ArrowDown' });if (mobile) {diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsxindex 4db4e613cc..6b461f94bc 100644--- a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx@@ -103,8 +103,8 @@ vi.mock('@ui', () => {const OPTIONS: CatalogModelOption[] = [{ id: 'auto', label: 'Auto', group: 'Auto' },{ id: 'grok', label: 'Cursor Grok 4.6 High Fast' },- { id: 'opus', label: 'Opus 5 High' },- { id: 'sonnet', label: 'Sonnet 5 High' },+ { id: 'opus', label: 'Opus 5.5 High' },+ { id: 'sonnet', label: 'Sonnet 5.5 High' },{ id: 'sol', label: 'GPT-5.6 Sol High' },{ id: 'gemini', label: 'Gemini 3.8 Flash High' },];@@ -268,10 +268,10 @@ describe('ModelCatalogPicker more models at phone width', () => {fireEvent.click(screen.getByText('More models'));expect(screen.getByText('Gemini 3.8 Flash High')).toBeTruthy();- expect(screen.queryByText('Opus 5 High')).toBeNull();+ expect(screen.queryByText('Opus 5.5 High')).toBeNull();fireEvent.click(screen.getByRole('menuitem', { name: 'Recommended' }));- expect(screen.getByText('Opus 5 High')).toBeTruthy();+ expect(screen.getByText('Opus 5.5 High')).toBeTruthy();expect(screen.queryByText('Gemini 3.8 Flash High')).toBeNull();});diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.test.tsxindex 2680ab2720..916c7334c6 100644--- a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.test.tsx@@ -115,13 +115,16 @@ describe('ModelSelector: availability', () => {);});- it('does not list Fable', () => {+ it('does not list retired Anthropic models', () => {const { container } = render(() => (<ModelSelector models={ALL_PAID} onSelect={() => {}} />));- expect(container.textContent).not.toContain(- MODEL_PRETTYNAME[Model.fable51]- );+ for (const retired of ['Fable', 'Sonnet 5 ', 'Opus 5 ']) {+ expect(container.textContent).not.toContain(retired);+ }+ expect(container.textContent).toContain('Sonnet 5.5');+ expect(container.textContent).toContain('Opus 5.5');+ expect(container.textContent).toContain('Haiku 4.5');});it.each([@@ -156,7 +159,7 @@ describe('ModelSelector: availability', () => {expect(available.className).not.toContain('opacity-50');expect(available.querySelector('[data-testid="lock-icon"]')).toBeNull();- const locked = itemFor(container, Model.opus5);+ const locked = itemFor(container, Model.opus55);expect(locked.className).toContain('opacity-50');expect(locked.querySelector('[data-testid="lock-icon"]')).not.toBeNull();});@@ -191,8 +194,8 @@ describe('ModelSelector: selection routing', () => {<ModelSelector models={options} onSelect={onSelect} onLocked={onLocked} />));- fireEvent.click(itemFor(container, Model.opus5)); // locked for a free user- expect(onLocked).toHaveBeenCalledWith(Model.opus5);+ fireEvent.click(itemFor(container, Model.opus55)); // locked for a free user+ expect(onLocked).toHaveBeenCalledWith(Model.opus55);expect(onSelect).not.toHaveBeenCalled();});});@@ -202,7 +205,7 @@ describe('ModelSelector: what is shown is what is sent', () => {// model accessor. Picking a model updates that single source, so the request// can never diverge from what the selector displays.function Harness() {- const [model, setModel] = createSignal<TModel>(Model.opus5);+ const [model, setModel] = createSignal<TModel>(Model.opus55);return (<>{/* stand-in for the value sendMessage() reads */}@@ -221,14 +224,14 @@ describe('ModelSelector: what is shown is what is sent', () => {// Initial state: trigger shows the selected model.const trigger = container.querySelector('[data-trigger]')!;- expect(trigger.textContent).toContain(MODEL_PRETTYNAME[Model.opus5]);- expect(getByTestId('would-send').textContent).toBe(Model.opus5);+ expect(trigger.textContent).toContain(MODEL_PRETTYNAME[Model.opus55]);+ expect(getByTestId('would-send').textContent).toBe(Model.opus55);// Select a different model -> both the trigger and the would-send value move// together to exactly that model.- fireEvent.click(itemFor(container, Model.sonnet5));- expect(getByTestId('would-send').textContent).toBe(Model.sonnet5);- expect(trigger.textContent).toContain(MODEL_PRETTYNAME[Model.sonnet5]);+ fireEvent.click(itemFor(container, Model.sonnet55));+ expect(getByTestId('would-send').textContent).toBe(Model.sonnet55);+ expect(trigger.textContent).toContain(MODEL_PRETTYNAME[Model.sonnet55]);});it('a free user cannot select an inaccessible model into the would-send value', () => {@@ -254,10 +257,10 @@ describe('ModelSelector: what is shown is what is sent', () => {}const { container, getByTestId } = render(() => <FreeHarness />);- fireEvent.click(itemFor(container, Model.opus5)); // locked+ fireEvent.click(itemFor(container, Model.opus55)); // locked// The would-send value is unchanged; only the paywall fired.expect(getByTestId('would-send').textContent).toBe(Model.haiku45);- expect(onLocked).toHaveBeenCalledWith(Model.opus5);+ expect(onLocked).toHaveBeenCalledWith(Model.opus55);});});diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsxindex 3baf8a22d1..cb4b6b2370 100644--- a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx+++ b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx@@ -39,9 +39,8 @@ const ALL_AVAILABLE: ModelOption[] = PAID_MODELS.map((id) => ({}));const MODEL_DESCRIPTION: Record<TModel, string> = {- [Model.sonnet5]: 'Everyday writing, coding, and questions',- [Model.opus5]: 'Complex tasks and deeper analysis',- [Model.fable51]: 'The most capable model for the hardest work',+ [Model.sonnet55]: 'Everyday writing, coding, and questions',+ [Model.opus55]: 'Complex tasks and deeper analysis',[Model.haiku45]: 'Quick answers and lighter tasks',[Model.gpt6Astra]: 'Frontier reasoning for the hardest problems',[Model.gpt56]: 'Reasoning, writing, and problem solving',diff --git a/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts b/apps/web/src/lib/core/component/AI/component/input/modelCatalog.tsindex 9b7da9ef13..c0579764a3 100644--- a/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts+++ b/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts@@ -29,8 +29,8 @@ export type ModelCatalog = {const RECOMMENDED_PREFIXES = ['Auto','Cursor Grok 4.6',- 'Opus 5',- 'Sonnet 5',+ 'Opus 5.5',+ 'Sonnet 5.5','GPT-5.6 Sol','Gemini 3.8 Flash','Codex',@@ -198,8 +198,8 @@ export function modelFamilyHint(/*** Whether a search query hits this model by name, by its heading, or by its- * id — a name displayed as "Sonnet 5" should still be findable by typing the- * vendor out of its `anthropic/claude-sonnet-5` slug.+ * id — a name displayed as "Sonnet 5.5" should still be findable by typing the+ * vendor out of its `anthropic/claude-sonnet-5-5` slug.*/export function matchesModelQuery(option: CatalogModelOption, query: string) {const family = option.group ?? inferModelFamily(option.label);diff --git a/apps/web/src/lib/core/component/AI/constant/model-label.test.ts b/apps/web/src/lib/core/component/AI/constant/model-label.test.tsindex 11ff9db742..915f4dedc2 100644--- a/apps/web/src/lib/core/component/AI/constant/model-label.test.ts+++ b/apps/web/src/lib/core/component/AI/constant/model-label.test.ts@@ -3,9 +3,10 @@ import { modelLabel } from './model-label';describe('modelLabel', () => {it('prefers the house name for models the app routes itself', () => {- expect(modelLabel('anthropic/claude-sonnet-5')).toBe('Sonnet 5');+ expect(modelLabel('anthropic/claude-sonnet-5-5')).toBe('Sonnet 5.5');expect(modelLabel('openai/gpt-5.6-mini')).toBe('GPT-5.6 mini');// Runtimes that drop the provider segment still get the house name.+ expect(modelLabel('claude-opus-5-5')).toBe('Opus 5.5');expect(modelLabel('claude-haiku-4-5')).toBe('Haiku 4.5');expect(modelLabel('fireworks/kimi-k3')).toBe('Kimi K3');expect(modelLabel('kimi-k3')).toBe('Kimi K3');@@ -27,6 +28,8 @@ describe('modelLabel', () => {it('reads an unknown slug as a name rather than showing it raw', () => {expect(modelLabel('anthropic/claude-sonnet-3.8')).toBe('Sonnet 3.8');+ // Retired Claude ids a session row may still carry read as names too.+ expect(modelLabel('anthropic/claude-sonnet-5')).toBe('Sonnet 5');expect(modelLabel('openai/gpt-5.5')).toBe('GPT-5.5');expect(modelLabel('openai/gpt-5-mini')).toBe('GPT-5 mini');expect(modelLabel('google/gemini-3.8-flash')).toBe('Gemini 3.8 Flash');diff --git a/apps/web/src/lib/core/component/AI/constant/model-label.ts b/apps/web/src/lib/core/component/AI/constant/model-label.tsindex 9e511acf5c..7093eaa0ba 100644--- a/apps/web/src/lib/core/component/AI/constant/model-label.ts+++ b/apps/web/src/lib/core/component/AI/constant/model-label.ts@@ -7,7 +7,7 @@* guaranteed to be in {@link MODEL_PRETTYNAME}. Harnesses that keep no* display name for a model (the in-memory Macro Agent among them) echo the* slug back as the name, so anything that renders the reported name verbatim- * shows `claude-sonnet-5` where the rest of the app says "Sonnet 5". Route+ * shows `claude-sonnet-5-5` where the rest of the app says "Sonnet 5.5". Route* those through {@link modelLabel} instead.*/diff --git a/apps/web/src/lib/core/component/AI/constant/model.test.ts b/apps/web/src/lib/core/component/AI/constant/model.test.tsindex 780352a74a..75122a4312 100644--- a/apps/web/src/lib/core/component/AI/constant/model.test.ts+++ b/apps/web/src/lib/core/component/AI/constant/model.test.ts@@ -7,6 +7,7 @@ import {databaseModelForPlan,defaultModelForPlan,FREE_DEFAULT_MODEL,+ MODEL_PRETTYNAME,MODEL_PROVIDER,Model,modelsForPlan,@@ -21,18 +22,30 @@ describe('modelsForPlan / defaultModelForPlan', () => {it('gives paid users every picker model and an Anthropic-smart default', () => {const paid = modelsForPlan(true);expect(paid).toEqual(PAID_MODELS);- expect(paid).not.toContain(Model.fable51);- expect(DEFAULT_MODEL).toBe(Model.sonnet5);+ expect(paid).toEqual(Object.values(Model));+ expect(DEFAULT_MODEL).toBe(Model.sonnet55);expect(defaultModelForPlan(true)).toBe(DEFAULT_MODEL);});- it('gives free users only the fast model, defaulted to it', () => {+ it('gives free users only the free model, defaulted to it', () => {const free = modelsForPlan(false);expect(free).toEqual([FREE_DEFAULT_MODEL]);+ expect(FREE_DEFAULT_MODEL).toBe(Model.haiku45);expect(defaultModelForPlan(false)).toBe(FREE_DEFAULT_MODEL);// The premium models are *not* in a free user's selectable set.- expect(free).not.toContain(Model.opus5);+ expect(free).not.toContain(Model.sonnet55);+ expect(free).not.toContain(Model.opus55);expect(free).not.toContain(Model.gpt56);+ expect(free).not.toContain(Model.gpt6Astra);+ });++ it('offers only the current Anthropic generation', () => {+ const anthropic = Object.values(Model).filter(+ (id) => MODEL_PROVIDER[id] === 'anthropic'+ );+ expect(anthropic).toEqual([Model.sonnet55, Model.opus55, Model.haiku45]);+ expect(MODEL_PRETTYNAME[Model.sonnet55]).toBe('Sonnet 5.5');+ expect(MODEL_PRETTYNAME[Model.opus55]).toBe('Opus 5.5');});});@@ -48,18 +61,12 @@ describe('databaseModelForPlan', () => {describe('modelUsageHint', () => {it('flags the heavy paid models and stays quiet for the default and cheaper', () => {- expect(modelUsageHint(Model.fable51)).toBe('5× usage');expect(modelUsageHint(Model.gpt6Astra)).toBe('5× usage');- expect(modelUsageHint(Model.opus5)).toBe('2.5× usage');- expect(modelUsageHint(Model.sonnet5)).toBeUndefined();+ expect(modelUsageHint(Model.gpt56)).toBe('3× usage');+ expect(modelUsageHint(Model.opus55)).toBe('2.5× usage');+ expect(modelUsageHint(Model.sonnet55)).toBeUndefined();expect(modelUsageHint(Model.haiku45)).toBeUndefined();- });-- it('removes Fable from plan options while keeping Astra paid-only', () => {- expect(modelsForPlan(false)).not.toContain(Model.fable51);- expect(modelsForPlan(false)).not.toContain(Model.gpt6Astra);- expect(modelsForPlan(true)).not.toContain(Model.fable51);- expect(modelsForPlan(true)).toContain(Model.gpt6Astra);+ expect(modelUsageHint(Model.gpt56Mini)).toBeUndefined();});});@@ -71,8 +78,9 @@ describe('parseModel', () => {});it('rejects unknown / empty values so callers can fall back to a default', () => {- expect(parseModel('anthropic/claude-opus-4-7')).toBeUndefined(); // retired id- expect(parseModel('anthropic/claude-sonnet-4-6')).toBeUndefined(); // retired id+ expect(parseModel('anthropic/claude-sonnet-5')).toBeUndefined(); // retired id+ expect(parseModel('anthropic/claude-opus-5')).toBeUndefined(); // retired id+ expect(parseModel('anthropic/claude-fable-5-1')).toBeUndefined(); // retired idexpect(parseModel('gpt-5.6')).toBeUndefined(); // unprefixed / legacyexpect(parseModel('not-a-model')).toBeUndefined();expect(parseModel('')).toBeUndefined();@@ -93,8 +101,8 @@ describe('alternateProviderModel', () => {it('only ever suggests a model the user has access to (stays within candidates)', () => {// Candidates model the user's accessible models. The suggestion must be// one of them, never a model outside the accessible set.- const candidates: TModel[] = [Model.haiku45, Model.gpt56Mini];- const alt = alternateProviderModel(Model.opus5, { candidates });+ const candidates: TModel[] = [Model.sonnet55, Model.gpt56Mini];+ const alt = alternateProviderModel(Model.opus55, { candidates });expect(candidates).toContain(alt);expect(PROVIDER_OF(alt!)).toBe('openai'); // the only different-provider candidate});@@ -107,8 +115,8 @@ describe('alternateProviderModel', () => {).toBeUndefined();// Likewise when every candidate shares the current (Anthropic) provider.expect(- alternateProviderModel(Model.opus5, {- candidates: [Model.haiku45, Model.sonnet5],+ alternateProviderModel(Model.opus55, {+ candidates: [Model.sonnet55],})).toBeUndefined();});@@ -119,7 +127,7 @@ describe('alternateProviderModel', () => {// just the current model's provider.const candidates = [...Object.values(Model)] as TModel[];const failedProviders = new Set<string>();- let current: TModel = Model.opus5; // anthropic+ let current: TModel = Model.opus55; // anthropic// Anthropic has an outage → suggest a different provider.failedProviders.add(PROVIDER_OF(current));@@ -151,7 +159,7 @@ describe('alternateProviderModel', () => {});it('still avoids the current provider when no failures are recorded', () => {- const alt = alternateProviderModel(Model.opus5, {+ const alt = alternateProviderModel(Model.opus55, {candidates: [...Object.values(Model)] as TModel[],failedProviders: new Set(),});diff --git a/apps/web/src/lib/core/component/AI/constant/model.ts b/apps/web/src/lib/core/component/AI/constant/model.tsindex 2616f6011c..a07d9388dc 100644--- a/apps/web/src/lib/core/component/AI/constant/model.ts+++ b/apps/web/src/lib/core/component/AI/constant/model.ts@@ -8,11 +8,14 @@ import GoogleIcon from '@phosphor-fill/google-logo-fill.svg';* picks the provider) — the backend `AgentModel` enum is intentionally not* exposed to the frontend. Reference these constants instead of hardcoding* strings.+ *+ * Sonnet 5.5 and Opus 5.5 are the current Anthropic generation. Haiku 4.5+ * stays as the fast model; older Sonnet, Opus, and Fable ids are absent, so a+ * persisted chat on one falls back to the default.*/export const Model = {- sonnet5: 'anthropic/claude-sonnet-5',- opus5: 'anthropic/claude-opus-5',- fable51: 'anthropic/claude-fable-5-1',+ sonnet55: 'anthropic/claude-sonnet-5-5',+ opus55: 'anthropic/claude-opus-5-5',haiku45: 'anthropic/claude-haiku-4-5',gpt6Astra: 'openai/gpt-6-astra',gpt56: 'openai/gpt-5.6',@@ -25,19 +28,13 @@ export type Model = (typeof Model)[keyof typeof Model];/** Alias kept for existing call sites. */export type TModel = Model;-/** Models intentionally hidden from chat model pickers. */-export function isModelPickerOption(modelId: string): boolean {- return modelId !== Model.fable51;-}-type ExhaustiveMap = {[K in TModel]: any;};export const MODEL_PRETTYNAME: ExhaustiveMap = {- 'anthropic/claude-sonnet-5': 'Sonnet 5',- 'anthropic/claude-opus-5': 'Opus 5',- 'anthropic/claude-fable-5-1': 'Fable 5.1',+ 'anthropic/claude-sonnet-5-5': 'Sonnet 5.5',+ 'anthropic/claude-opus-5-5': 'Opus 5.5','anthropic/claude-haiku-4-5': 'Haiku 4.5','openai/gpt-6-astra': 'GPT-6 Astra','openai/gpt-5.6': 'GPT-5.6',@@ -46,9 +43,8 @@ export const MODEL_PRETTYNAME: ExhaustiveMap = {} as const;export const MODEL_PROVIDER_ICON: ExhaustiveMap = {- 'anthropic/claude-sonnet-5': ClaudeIcon,- 'anthropic/claude-opus-5': ClaudeIcon,- 'anthropic/claude-fable-5-1': ClaudeIcon,+ 'anthropic/claude-sonnet-5-5': ClaudeIcon,+ 'anthropic/claude-opus-5-5': ClaudeIcon,'anthropic/claude-haiku-4-5': ClaudeIcon,'openai/gpt-6-astra': OpenAiIcon,'openai/gpt-5.6': OpenAiIcon,@@ -58,16 +54,15 @@ export const MODEL_PROVIDER_ICON: ExhaustiveMap = {/*** How fast each model draws down a paid plan's included AI, relative to the- * default model (Sonnet 5 = 1). Mirrors the per-token rates in `ai_pricing`+ * default model (Sonnet 5.5 = 1). Mirrors the per-token rates in `ai_pricing`* (output price, which dominates chat cost): Haiku $5, Sonnet $10, Opus $25,- * Fable $50, GPT-6 Astra $50, GPT-5.6 $30, GPT-5.6 mini $4.50, Gemini 3.8- * Flash $3.75 per million tokens. Shown in the picker so choosing a heavy- * model is a deliberate trade.+ * GPT-6 Astra $50, GPT-5.6 $30, GPT-5.6 mini $4.50, Gemini 3.8 Flash $3.75+ * per million tokens. Shown in the picker so choosing a heavy model is a+ * deliberate trade.*/export const MODEL_USAGE_MULTIPLIER: { [K in TModel]: number } = {- 'anthropic/claude-sonnet-5': 1,- 'anthropic/claude-opus-5': 2.5,- 'anthropic/claude-fable-5-1': 5,+ 'anthropic/claude-sonnet-5-5': 1,+ 'anthropic/claude-opus-5-5': 2.5,'anthropic/claude-haiku-4-5': 0.5,'openai/gpt-6-astra': 5,'openai/gpt-5.6': 3,@@ -86,15 +81,17 @@ export function modelUsageHint(model: TModel): string | undefined {}/** Default model for paid users. */-export const DEFAULT_MODEL: TModel = Model.sonnet5;+export const DEFAULT_MODEL: TModel = Model.sonnet55;/*** Default model for free users. Free users aren't entitled to the premium- * "smart" models (which the backend rejects with a 403), so they start on the- * fast model instead of Opus.+ * models (which the backend rejects with a 403), so they start on Haiku.*/export const FREE_DEFAULT_MODEL: TModel = Model.haiku45;+/** Models a paid user may select. */+export const PAID_MODELS: readonly TModel[] = Object.values(Model);+/*** Model for database AI: question answering, the database assistant, and chats* opened from a database. Paid-only, like every model but {@link FREE_DEFAULT_MODEL}.@@ -102,18 +99,11 @@ export const FREE_DEFAULT_MODEL: TModel = Model.haiku45;export const DATABASE_MODEL: TModel = Model.gemini38Flash;/**- * Models a paid user may select. Fable remains a known model so persisted- * chats can still be parsed, but it is intentionally absent from the picker.- */-export const PAID_MODELS: readonly TModel[] =- Object.values(Model).filter(isModelPickerOption);--/**- * Models a free user may select. Free users only get the fast model+ * Models a free user may select. Free users only get Haiku* (`FREE_DEFAULT_MODEL`); every other model is paid-only and shows locked in* the selector, where selecting one opens the paywall instead of being sent- * and rejected by the backend. The heavy models (Opus, Fable, GPT-6 Astra)- * are on every paid plan; they just draw the included AI down faster, see+ * and rejected by the backend. The heavy models (Opus, GPT-6 Astra) are on+ * every paid plan; they just draw the included AI down faster, see* `MODEL_USAGE_MULTIPLIER`.*/export const FREE_MODELS: readonly TModel[] = [FREE_DEFAULT_MODEL];@@ -137,9 +127,8 @@ export function databaseModelForPlan(hasPaidAccess: boolean): TModel {/** Provider serving each model — mirrors the backend `provider` field. */export const MODEL_PROVIDER: ExhaustiveMap = {- 'anthropic/claude-sonnet-5': 'anthropic',- 'anthropic/claude-opus-5': 'anthropic',- 'anthropic/claude-fable-5-1': 'anthropic',+ 'anthropic/claude-sonnet-5-5': 'anthropic',+ 'anthropic/claude-opus-5-5': 'anthropic','anthropic/claude-haiku-4-5': 'anthropic','openai/gpt-6-astra': 'openai','openai/gpt-5.6': 'openai',diff --git a/apps/web/src/lib/core/component/AI/state/createChatController.test.tsx b/apps/web/src/lib/core/component/AI/state/createChatController.test.tsxindex f526d85408..d1e900f8d3 100644--- a/apps/web/src/lib/core/component/AI/state/createChatController.test.tsx+++ b/apps/web/src/lib/core/component/AI/state/createChatController.test.tsx@@ -91,7 +91,7 @@ describe('createChatController: provider-failure toast', () => {// Mirror exactly how Chat.tsx wires onSwitchModel: the chat's model signal// is the single source of truth, swapped via alternateProviderModel against// the user's accessible (paid) models.- const [model, setModel] = createSignal<TModel>(Model.opus5);+ const [model, setModel] = createSignal<TModel>(Model.opus55);const onSwitchModel = () => {const alt = alternateProviderModel(model(), {candidates: [...modelsForPlan(true)],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.tsindex 7e407f4ebd..23f39346c3 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@@ -26,10 +26,10 @@ describe('chat input storage: model defaults', () => {it('keeps each chat on its own remembered model', () => {storeChatStateImmediate('chat-a', { model: Model.gpt56 });- storeChatStateImmediate('chat-b', { model: Model.sonnet5 });+ storeChatStateImmediate('chat-b', { model: Model.sonnet55 });expect(getChatInputStoredState('chat-a').model).toBe(Model.gpt56);- expect(getChatInputStoredState('chat-b').model).toBe(Model.sonnet5);+ expect(getChatInputStoredState('chat-b').model).toBe(Model.sonnet55);});it('returns no stored model for a chat that has never been used', () => {diff --git a/crates/agent/src/model/reasoning_effort.rs b/crates/agent/src/model/reasoning_effort.rsindex 22c1b5ac1a..7d6feb9252 100644--- a/crates/agent/src/model/reasoning_effort.rs+++ b/crates/agent/src/model/reasoning_effort.rs@@ -31,7 +31,7 @@ impl ReasoningEffort {pub fn supported(model: &str) -> &'static [Self] {use ReasoningEffort::*;match model {- "anthropic/claude-sonnet-5" | "anthropic/claude-opus-5" => {+ "anthropic/claude-sonnet-5-5" | "anthropic/claude-opus-5-5" => {&[Default, Low, Medium, High, XHigh, Max]}"openai/gpt-5.5" => &[Default, None, Low, Medium, High, XHigh],diff --git a/crates/agent/src/test/test_router.rs b/crates/agent/src/test/test_router.rsindex c7f6192e39..cfba169433 100644--- a/crates/agent/src/test/test_router.rs+++ b/crates/agent/src/test/test_router.rs@@ -115,7 +115,7 @@ fn google_provider_without_a_client_is_unroutable() {fn selected_effort_is_mapped_to_each_provider_request_shape() {let router = test_router();- let RoutedModel::Anthropic(anthropic) = router.route("anthropic/claude-sonnet-5").unwrap()+ let RoutedModel::Anthropic(anthropic) = router.route("anthropic/claude-sonnet-5-5").unwrap()else {panic!("sonnet should use the native Anthropic client");};@@ -165,10 +165,13 @@ fn native_effort_profiles_preserve_defaults_and_provider_boundaries() {);assert!(ReasoningEffort::supported("compatible/gpt-5-mini").is_empty());assert!(ReasoningEffort::supported("anthropic/claude-haiku-4-5").is_empty());+ // Retired Anthropic ids are no longer offered, so they advertise no effort.+ assert!(ReasoningEffort::supported("anthropic/claude-sonnet-5").is_empty());+ assert!(ReasoningEffort::supported("anthropic/claude-opus-5").is_empty());assert!(ReasoningEffort::supported("openai/unknown").is_empty());for model in [- "anthropic/claude-sonnet-5",- "anthropic/claude-opus-5",+ "anthropic/claude-sonnet-5-5",+ "anthropic/claude-opus-5-5","openai/gpt-5.5","openai/gpt-5-mini",] {diff --git a/crates/agent_inmem/src/domain/agent/test.rs b/crates/agent_inmem/src/domain/agent/test.rsindex a4b169f66e..4fddfd56b3 100644--- a/crates/agent_inmem/src/domain/agent/test.rs+++ b/crates/agent_inmem/src/domain/agent/test.rs@@ -74,7 +74,7 @@ async fn with_admission<Engine: TurnEngine, Out>(let session_id = AgentSessionId::new();store.insert(session_id,- crate::domain::session::SessionState::new("anthropic/claude-sonnet-5".into()),+ crate::domain::session::SessionState::new("anthropic/claude-sonnet-5-5".into()),);let state = Arc::new(AgentState {session_id,@@ -409,7 +409,7 @@ async fn new_session_advertises_the_engine_supported_models() {let selection = agent_fold::domain::model_selection::model_selection(&config_options).expect("session/new should advertise a model select");- assert_eq!(selection.current, "anthropic/claude-sonnet-5");+ assert_eq!(selection.current, "anthropic/claude-sonnet-5-5");assert_eq!(selection.options@@ -417,7 +417,7 @@ async fn new_session_advertises_the_engine_supported_models() {.map(|model| (model.id.as_str(), model.name.as_str())).collect::<Vec<_>>(),vec![- ("anthropic/claude-sonnet-5", "anthropic/claude-sonnet-5"),+ ("anthropic/claude-sonnet-5-5", "anthropic/claude-sonnet-5-5"),("other-model", "other-model")]);@@ -638,7 +638,7 @@ async fn turns_accumulate_history_and_send_the_model() {let requests = engine.requests();assert_eq!(requests.len(), 2);- assert_eq!(requests[0].model, "anthropic/claude-sonnet-5");+ assert_eq!(requests[0].model, "anthropic/claude-sonnet-5-5");assert_eq!(requests[0].messages, vec!["first".to_owned()]);// The second turn carries the first turn's prompt and reply.assert_eq!(@@ -867,7 +867,7 @@ async fn session_new_dials_the_advertised_servers_except_macros_own() {let session_id = AgentSessionId::new();store.insert(session_id,- crate::domain::session::SessionState::new("anthropic/claude-sonnet-5".into()),+ crate::domain::session::SessionState::new("anthropic/claude-sonnet-5-5".into()),);let state = Arc::new(AgentState {session_id,@@ -961,7 +961,7 @@ wherelet session_id = AgentSessionId::new();store.insert(session_id,- crate::domain::session::SessionState::new("anthropic/claude-sonnet-5".into()),+ crate::domain::session::SessionState::new("anthropic/claude-sonnet-5-5".into()),);let state = Arc::new(AgentState {session_id,@@ -1544,7 +1544,7 @@ async fn effort_is_validated_and_model_changes_return_complete_options() {.send_request(SetSessionConfigOptionRequest::new(session,MODEL_CONFIG_ID,- "anthropic/claude-sonnet-5",+ "anthropic/claude-sonnet-5-5",)).block_task().awaitdiff --git a/crates/agent_inmem/src/domain/model_options/test.rs b/crates/agent_inmem/src/domain/model_options/test.rsindex 71f0e672ac..dd339e07de 100644--- a/crates/agent_inmem/src/domain/model_options/test.rs+++ b/crates/agent_inmem/src/domain/model_options/test.rs@@ -5,7 +5,7 @@ use agent_fold::domain::model_selection::model_selection;fn routed_options_use_house_names() {let options = model_config_options("fireworks/kimi-k3",- &["fireworks/kimi-k3", "anthropic/claude-sonnet-5"],+ &["fireworks/kimi-k3", "anthropic/claude-sonnet-5-5"],);let selection = model_selection(&options).expect("a model select");assert_eq!(selection.current, "fireworks/kimi-k3");@@ -17,7 +17,7 @@ fn routed_options_use_house_names() {.collect::<Vec<_>>(),vec![("fireworks/kimi-k3", "Kimi K3"),- ("anthropic/claude-sonnet-5", "anthropic/claude-sonnet-5"),+ ("anthropic/claude-sonnet-5-5", "anthropic/claude-sonnet-5-5"),]);}diff --git a/crates/agent_inmem/src/domain/models/test.rs b/crates/agent_inmem/src/domain/models/test.rsindex 1828f17a85..a4c92cefa9 100644--- a/crates/agent_inmem/src/domain/models/test.rs+++ b/crates/agent_inmem/src/domain/models/test.rs@@ -34,8 +34,8 @@ fn routed_models_have_house_names() {);assert_eq!(display_name("google/gemini-3.8-flash"), "Gemini 3.8 Flash");assert_eq!(- display_name("anthropic/claude-sonnet-5"),- "anthropic/claude-sonnet-5"+ display_name("anthropic/claude-sonnet-5-5"),+ "anthropic/claude-sonnet-5-5");}diff --git a/crates/agent_inmem/src/domain/replay/test.rs b/crates/agent_inmem/src/domain/replay/test.rsindex 4808f72811..478221150b 100644--- a/crates/agent_inmem/src/domain/replay/test.rs+++ b/crates/agent_inmem/src/domain/replay/test.rs@@ -239,8 +239,8 @@ fn only_confirmed_effort_replays_and_removal_resets_it() {let mut frames = vec![config_frame(REASONING_EFFORT_CONFIG_ID, "low")];assert_eq!(replay_reasoning_effort(&frames), ReasoningEffort::Default);let options = crate::domain::model_options::session_config_options(- "anthropic/claude-sonnet-5",- &["anthropic/claude-sonnet-5"],+ "anthropic/claude-sonnet-5-5",+ &["anthropic/claude-sonnet-5-5"],ReasoningEffort::Low,);frames.push(config_response(diff --git a/crates/agent_inmem/src/outbound/manager/test.rs b/crates/agent_inmem/src/outbound/manager/test.rsindex efd49fd943..8c0e13025c 100644--- a/crates/agent_inmem/src/outbound/manager/test.rs+++ b/crates/agent_inmem/src/outbound/manager/test.rs@@ -103,7 +103,7 @@ fn facts(id: AgentSessionId) -> SessionFacts {SessionFacts {id,owner: Owner::User(owner()),- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),identity: None,instructions: None,acp_session_id: None,@@ -175,7 +175,7 @@ async fn a_prompt_runs_end_to_end_through_the_real_session_machine() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),@@ -314,7 +314,7 @@ async fn manager_admission_rejects_turns_without_wedging_the_session() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),@@ -406,7 +406,7 @@ async fn a_restarted_manager_rebuilds_the_conversation_from_the_log() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),@@ -553,7 +553,7 @@ async fn instructions_reach_every_turn_including_after_a_reattach() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),@@ -628,7 +628,7 @@ async fn a_session_without_instructions_hands_the_engine_none() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),@@ -688,7 +688,7 @@ async fn identity_reaches_every_turn_including_after_a_reattach() {bot_id: BotId::TEST_A,thread_id: None,originating_message_id: None,- model: "anthropic/claude-sonnet-5".to_owned(),+ model: "anthropic/claude-sonnet-5-5".to_owned(),harness: "macro-inmem".to_owned(),repo_url: None,workspace: "/workspace".to_owned(),diff --git a/crates/agent_inmem/src/testing.rs b/crates/agent_inmem/src/testing.rsindex e2719d720f..9961038194 100644--- a/crates/agent_inmem/src/testing.rs+++ b/crates/agent_inmem/src/testing.rs@@ -109,7 +109,7 @@ impl ai_billing::domain::BillingService for UnavailableBilling {}/// Models advertised by shared test engines.-pub(crate) const TEST_MODELS: &[&str] = &["anthropic/claude-sonnet-5", "other-model"];+pub(crate) const TEST_MODELS: &[&str] = &["anthropic/claude-sonnet-5-5", "other-model"];/// An engine that plays back a script of parts for every turn.pub(crate) struct ScriptedEngine {diff --git a/crates/chat/src/domain/models/model_access.rs b/crates/chat/src/domain/models/model_access.rsindex ebe91c0339..5467953fe8 100644--- a/crates/chat/src/domain/models/model_access.rs+++ b/crates/chat/src/domain/models/model_access.rs@@ -4,10 +4,12 @@//! users may use every model in [`CHAT_MODELS`]./// The chat models offered to users, best-first.+///+/// The current Anthropic generation is Sonnet 5.5 and Opus 5.5. Haiku 4.5+/// stays as the fast model; older Sonnet, Opus, and Fable ids are absent.pub const CHAT_MODELS: &[&str] = &[- "anthropic/claude-sonnet-5",- "anthropic/claude-opus-5",- "anthropic/claude-fable-5-1",+ "anthropic/claude-sonnet-5-5",+ "anthropic/claude-opus-5-5","anthropic/claude-haiku-4-5","openai/gpt-6-astra","openai/gpt-5.6",@@ -17,7 +19,7 @@ pub const CHAT_MODELS: &[&str] = &[];/// The default model for professional (paid) users.-pub const PAID_DEFAULT_MODEL: &str = "anthropic/claude-sonnet-5";+pub const PAID_DEFAULT_MODEL: &str = "anthropic/claude-sonnet-5-5";/// The only model available to free (non-professional) users.pub const FREE_MODEL: &str = "anthropic/claude-haiku-4-5";diff --git a/crates/chat/src/domain/service/model_access/test.rs b/crates/chat/src/domain/service/model_access/test.rsindex 60c881efae..b9330654fd 100644--- a/crates/chat/src/domain/service/model_access/test.rs+++ b/crates/chat/src/domain/service/model_access/test.rs@@ -1,32 +1,48 @@use super::*;+use crate::domain::models::CHAT_MODELS;-const HAIKU: &str = "anthropic/claude-haiku-4-5";+const SONNET_5_5: &str = "anthropic/claude-sonnet-5-5";+const OPUS_5_5: &str = "anthropic/claude-opus-5-5";+const HAIKU_4_5: &str = "anthropic/claude-haiku-4-5";const SONNET_5: &str = "anthropic/claude-sonnet-5";-const OPUS: &str = "anthropic/claude-opus-5";-const OPUS_4_7: &str = "anthropic/claude-opus-4-7";-const SONNET_4_6: &str = "anthropic/claude-sonnet-4-6";+const OPUS_5: &str = "anthropic/claude-opus-5";+const FABLE_5_1: &str = "anthropic/claude-fable-5-1";const GPT_5_5: &str = "openai/gpt-5.5";const GPT_5_MINI: &str = "openai/gpt-5-mini";#[test]-fn free_user_only_has_haiku() {+fn free_user_only_has_the_free_model() {let svc = ModelAccessServiceImpl;- assert_eq!(svc.best_model(false), HAIKU);- assert!(svc.has_access(false, HAIKU));- assert!(!svc.has_access(false, OPUS));- assert!(!svc.has_access(false, SONNET_4_6));+ assert_eq!(svc.best_model(false), FREE_MODEL);+ assert!(svc.has_access(false, FREE_MODEL));+ assert!(svc.has_access(false, HAIKU_4_5));+ assert!(!svc.has_access(false, OPUS_5_5));+ assert!(!svc.has_access(false, SONNET_5_5));assert!(!svc.has_access(false, GPT_5_5));}#[test]fn professional_user_has_everything() {let svc = ModelAccessServiceImpl;- assert_eq!(svc.best_model(true), SONNET_5);- assert!(svc.has_access(true, SONNET_5));- assert!(svc.has_access(true, HAIKU));- assert!(svc.has_access(true, OPUS));- assert!(svc.has_access(true, OPUS_4_7));- assert!(svc.has_access(true, SONNET_4_6));+ assert_eq!(svc.best_model(true), SONNET_5_5);+ assert!(svc.has_access(true, SONNET_5_5));+ assert!(svc.has_access(true, OPUS_5_5));+ assert!(svc.has_access(true, HAIKU_4_5));assert!(svc.has_access(true, GPT_5_5));assert!(svc.has_access(true, GPT_5_MINI));}++#[test]+fn only_the_current_anthropic_generation_is_offered() {+ let anthropic: Vec<&str> = CHAT_MODELS+ .iter()+ .copied()+ .filter(|model| model.starts_with("anthropic/"))+ .collect();+ assert_eq!(anthropic, [SONNET_5_5, OPUS_5_5, HAIKU_4_5]);+ for retired in [SONNET_5, OPUS_5, FABLE_5_1] {+ assert!(!CHAT_MODELS.contains(&retired), "{retired} is retired");+ }+ assert!(CHAT_MODELS.contains(&PAID_DEFAULT_MODEL));+ assert!(CHAT_MODELS.contains(&FREE_MODEL));+}diff --git a/crates/chat/src/inbound/http/extractors.rs b/crates/chat/src/inbound/http/extractors.rsindex f3dc5eb384..c1b9f65d47 100644--- a/crates/chat/src/inbound/http/extractors.rs+++ b/crates/chat/src/inbound/http/extractors.rs@@ -33,8 +33,8 @@ impl<P> Clone for UserPermissionsState<P> {/// Axum extractor resolving the requesting user's model entitlement from their/// permissions.///-/// Free users may use only [`FREE_MODEL`] (Haiku); professional (paid) users-/// may use every chat model. Backed by [`ModelAccessServiceImpl`].+/// Free users may use only [`FREE_MODEL`] (Haiku 4.5); professional (paid)+/// users may use every chat model. Backed by [`ModelAccessServiceImpl`].////// Type parameter `Auth` is the authorization service implementation and `P`/// is the roles-and-permissions service used to look up the caller's@@ -155,19 +155,21 @@ mod test {}#[test]- fn free_user_defaults_to_haiku_and_only_has_haiku() {+ fn free_user_defaults_to_free_model_and_only_has_it() {let free = access(&[]);assert_eq!(free.best_model(), FREE_MODEL);assert!(free.has_access(FREE_MODEL));- assert!(!free.has_access("anthropic/claude-opus-5"));+ assert!(free.has_access("anthropic/claude-haiku-4-5"));+ assert!(!free.has_access("anthropic/claude-opus-5-5"));+ assert!(!free.has_access("anthropic/claude-sonnet-5-5"));}#[test]fn professional_user_defaults_to_smart_and_has_everything() {let pro = access(&[PermissionId::ReadProfessionalFeatures]);- assert_eq!(pro.best_model(), "anthropic/claude-sonnet-5");- assert!(pro.has_access("anthropic/claude-sonnet-5"));- assert!(pro.has_access("anthropic/claude-opus-5"));+ assert_eq!(pro.best_model(), "anthropic/claude-sonnet-5-5");+ assert!(pro.has_access("anthropic/claude-sonnet-5-5"));+ assert!(pro.has_access("anthropic/claude-opus-5-5"));assert!(pro.has_access(FREE_MODEL));assert!(pro.has_access("openai/gpt-5.5"));}@@ -177,6 +179,6 @@ mod test {fn unrelated_permissions_stay_free() {let acc = access(&[PermissionId::WriteEmailTool, PermissionId::ReadDocxEditor]);assert!(!acc.professional());- assert!(!acc.has_access("anthropic/claude-opus-5"));+ assert!(!acc.has_access("anthropic/claude-opus-5-5"));}}diff --git a/docs/AGENT_EFFORT.md b/docs/AGENT_EFFORT.mdindex bce0e6c320..37f678acde 100644--- a/docs/AGENT_EFFORT.md+++ b/docs/AGENT_EFFORT.md@@ -24,10 +24,10 @@ provider serialization tests when adding support.| Routed model | Explicit effort values || --- | --- |-| anthropic/claude-sonnet-5, anthropic/claude-opus-5 | low, medium, high, xhigh, max |+| anthropic/claude-sonnet-5-5, anthropic/claude-opus-5-5 | low, medium, high, xhigh, max || openai/gpt-5.5 | none, low, medium, high, xhigh || openai/gpt-5-mini | minimal, low, medium, high |-| Haiku and unknown models | No effort control |+| Haiku 4.5, retired Claude ids (Sonnet 5, Opus 5), and unknown models | No effort control |Every supported profile also offers **Default**, meaning no session override.It preserves Macro's existing adapter defaults (including low for GPT-5 mini).diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.mdindex 9e3305f2c3..194bf5c06b 100644--- a/docs/AGENT_GUIDE/ai-chat.md+++ b/docs/AGENT_GUIDE/ai-chat.md@@ -186,11 +186,12 @@ the shimmer.Macro's models use the same searchable catalog as running sessions: a short**Recommended** list and a **More models** submenu grouped by model family,followed by **Agents** and **Coding agents** sections. Models have readable- names (for example, **Sonnet 5**) and provider or model icons aligned with the+ names (for example, **Sonnet 5.5**) and provider or model icons aligned with theagent icons. The in-memory catalog offers the closed Anthropic and OpenAI chatmodels; Kimi, DeepSeek, Muse, GLM, Qwen, MiniMax, GPT OSS, and Nemotron- open-weight models; and Google's **Gemini 3.8 Flash**. Older Sonnet and Opus- versions are not offered.+ open-weight models; and Google's **Gemini 3.8 Flash**. The Anthropic models+ are **Sonnet 5.5**, **Opus 5.5**, and **Haiku 4.5**; older Claude versions+ (Sonnet 5, Opus 5, Fable 5.1) are not offered.Selecting a model here selectsthe default runtime and applies that model to the next send, retracting the repository drawer.A model chosen from that catalog is remembered in local storage as the@@ -573,7 +574,7 @@ existing text sizing.- Contenteditable composer (placeholder `Ask AI, @mention anything` / `Describe the edit…`).- Model picker button showing the current model (e.g. `Haiku 4.5`). Paid plans list- `Sonnet 5`, `Opus 5`, `Fable 5.1`, `Haiku 4.5`, `GPT-6 Astra`, `GPT-5.6`, `GPT-5.6 mini`;+ `Sonnet 5.5`, `Opus 5.5`, `Haiku 4.5`, `GPT-6 Astra`, `GPT-5.6`, `GPT-5.6 mini`;in dev, heavy models carry a `2.5× usage` / `5× usage` hint.On the free plan everything but `Haiku 4.5` isdimmed with a lock and opens the `Smart models are premium` paywall when clicked.@@ -746,14 +747,14 @@ On mobile the composer (and any queued prompts above it) floats in the bottomaccessory region above the dock — same placement as channel and AI chat — so itstays tappable and clear of the home indicator. The box is full width; the textsits on top and a footer row holds the model (left, as a provider logo and-name, e.g. `✳ Sonnet 5 ⌄`) and **Send** (right). On touch devices Enter on the+name, e.g. `✳ Sonnet 5.5 ⌄`) and **Send** (right). On touch devices Enter on thevirtual keyboard inserts a newline and never sends; only **Send** submits, thesame as channel composers. This also applies to the Agents workspace sessionand new-conversation inputs and to the mobile **Ask AI** composer. On desktopEnter still sends and Shift+Enter inserts a newline. Tapping the model opens abottom sheet listing every model the same way, with a check on the current one— pick a row to switch. Models read as names even when the runtime reports-only ids: Macro Agent's `anthropic/claude-sonnet-5` shows as **Sonnet 5**. On desktop the+only ids: Macro Agent's `anthropic/claude-sonnet-5-5` shows as **Sonnet 5.5**. On desktop thetranscript and composer use the shared channel message width so expanding **Context** onlygrows vertically; your messages are right-aligned bubbles and the model pillsits above the box. Tap the session title@@ -1151,7 +1152,7 @@ There is no periodic PR lookup polling.Open the model selector and hover a model to choose its reasoning effort in thesubmenu. Keyboard users open it with Right Arrow; touch users tap the model.Cursor and Macro's in-memory agent load the hovered model's own advertised-choices. The selected label includes the effort, such as `Sonnet 5 · High`;+choices. The selected label includes the effort, such as `Sonnet 5.5 · High`;there is no separate effort control in the input box. Models without effortsupport remain selectable through `Use <model>` (or a desktop click/Enter).Default keeps the model's existing behavior.diff --git a/services/agent_harness_service/src/config.rs b/services/agent_harness_service/src/config.rsindex 0278eb8387..be04b0ba60 100644--- a/services/agent_harness_service/src/config.rs+++ b/services/agent_harness_service/src/config.rs@@ -143,7 +143,7 @@ pub struct Config {pub harness_repo_url: String,/// Model id stamped onto sessions the in-memory bot opens. Unknown ids/// fall back to the agent loop's default model.- #[macro_config_default(String::from("claude-sonnet-5"))]+ #[macro_config_default(String::from("claude-sonnet-5-5"))]pub inmem_model: String,/// Harness slug stamped onto sessions the in-memory bot opens.#[macro_config_default(String::from("macro-inmem"))]