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.

chore(ai): remove fable from model picker (#7013)

Will Hutchinsona9bbd6ae8b12
diff --git a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx b/apps/web/src/features/agents-view/components/ModelSelector.test.tsx
index dfdca274d8..389e1df7d2 100644
--- a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx
+++ b/apps/web/src/features/agents-view/components/ModelSelector.test.tsx
@@ -13,6 +13,12 @@ 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', () => {
@@ -43,6 +49,7 @@ 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',
});
diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsx
index 0d44c36346..0c242040b2 100644
--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx
+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx
@@ -1,5 +1,6 @@
import type { AgentModelSelectorProps } from '@app/features/block-agent/ui/AgentModelSelector';
import { ModelCatalogPicker } 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 { JSX } from 'solid-js';
@@ -24,12 +25,14 @@ export function ModelSelector(props: {
return (
<ModelCatalogPicker
value={props.model ?? null}
- options={props.options.map((option) => ({
- id: option.id,
- label: modelLabel(option.id, option.name),
- description: option.description,
- group: option.group,
- }))}
+ 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,
+ }))}
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.ts
index bf466dbfb2..441cc0c332 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
@@ -62,7 +62,10 @@ 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' }];
+ const models = [
+ { id: 'runtime-model', name: 'Runtime model' },
+ { id: 'anthropic/claude-fable-5-1', name: 'Fable 5.1' },
+ ];
discovery.queries = [
{
get isSuccess() {
@@ -93,7 +96,7 @@ describe('composer model discovery', () => {
expect(source.models()).toEqual([]);
expect(source.message()).toBe('Loading models…');
setReady(true);
- expect(source.models()).toEqual(models);
+ expect(source.models()).toEqual([models[0]]);
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.ts
index c0a5beb85c..4ef0e08cfd 100644
--- a/apps/web/src/features/agents-view/queries/composer-models.ts
+++ b/apps/web/src/features/agents-view/queries/composer-models.ts
@@ -1,3 +1,4 @@
+import { isModelPickerOption } from '@core/component/AI/constant/model';
import {
type AgentModelTarget,
useAgentModelsQueries,
@@ -35,7 +36,8 @@ export function createComposerModels(agent: Accessor<RosterAgent | undefined>) {
// Status-gated reads keep a pending catalog from suspending the composer.
const data = () => (queries[0]?.isSuccess ? queries[0].data : undefined);
return {
- models: () => data()?.models ?? [],
+ models: () =>
+ data()?.models.filter((model) => isModelPickerOption(model.id)) ?? [],
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.tsx
index 7344a95cac..e20d9e95e1 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -91,6 +91,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',
name: 'anthropic/claude-sonnet-5',
@@ -483,6 +487,7 @@ 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.getByRole('menuitem', { name: 'Sonnet 5' });
expect(
sonnet.querySelector('[data-ai-provider="anthropic"] svg')
diff --git a/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
index 85c41e51d5..b7eeb65a22 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
@@ -49,7 +49,7 @@ vi.mock('@core/component/LexicalMarkdown/utils/create-composer-layout', () => ({
vi.mock('@core/auth/license', () => ({ useHasPaidAccess: () => () => false }));
vi.mock('@core/component/AI/constant', () => ({
SUPPORTED_ATTACHMENT_EXTENSIONS: ['pdf', 'png'],
- Model: { test: 'test' },
+ PAID_MODELS: ['test'],
modelsForPlan: () => ['test'],
defaultModelForPlan: () => 'test',
}));
diff --git a/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx b/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
index 3af454715c..e8b308bfab 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
@@ -10,8 +10,9 @@ import type { ChatSendInput } from '@core/component/AI/component/input/buildRequ
import { ModelSelector } from '@core/component/AI/component/input/ModelSelector';
import {
defaultModelForPlan,
- Model,
+ type Model,
modelsForPlan,
+ PAID_MODELS,
SUPPORTED_ATTACHMENT_EXTENSIONS,
} from '@core/component/AI/constant';
import { useChatInputContext } from '@core/component/AI/context';
@@ -83,7 +84,7 @@ export function ChatInput(props: ChatInputComponentProps) {
// upsell at all.
const modelOptions = createMemo(() => {
const allowed = modelsForPlan(hasPaidAccess());
- return Object.values(Model).map((id) => ({
+ return PAID_MODELS.map((id) => ({
id,
available: allowed.includes(id),
}));
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.tsx
index 2d27eb2534..2680ab2720 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
@@ -6,6 +6,7 @@ import {
MODEL_PRETTYNAME,
Model,
modelsForPlan,
+ PAID_MODELS,
type TModel,
} from '@core/component/AI/constant';
import { cleanup, fireEvent, render } from '@solidjs/testing-library';
@@ -87,9 +88,10 @@ vi.mock('@phosphor-icons/core/regular/lock-simple.svg?component-solid', () => ({
default: () => <span data-testid="lock-icon" />,
}));
-const ALL_PAID: ModelOption[] = (Object.values(Model) as TModel[]).map(
- (id) => ({ id, available: true })
-);
+const ALL_PAID: ModelOption[] = PAID_MODELS.map((id) => ({
+ id,
+ available: true,
+}));
/** Find the menu item row for a model by its pretty name. */
function itemFor(container: HTMLElement, model: TModel): HTMLElement {
@@ -113,6 +115,15 @@ describe('ModelSelector: availability', () => {
);
});
+ it('does not list Fable', () => {
+ const { container } = render(() => (
+ <ModelSelector models={ALL_PAID} onSelect={() => {}} />
+ ));
+ expect(container.textContent).not.toContain(
+ MODEL_PRETTYNAME[Model.fable51]
+ );
+ });
+
it.each([
{ dev: false, mobile: false },
{ dev: true, mobile: false },
@@ -133,9 +144,10 @@ describe('ModelSelector: availability', () => {
it('grays out and locks inaccessible models, leaving accessible ones clean', () => {
// A free user: only the fast model is available.
const freeAllowed = modelsForPlan(false);
- const options: ModelOption[] = (Object.values(Model) as TModel[]).map(
- (id) => ({ id, available: freeAllowed.includes(id) })
- );
+ const options: ModelOption[] = PAID_MODELS.map((id) => ({
+ id,
+ available: freeAllowed.includes(id),
+ }));
const { container } = render(() => (
<ModelSelector models={options} onSelect={() => {}} />
));
@@ -171,9 +183,10 @@ describe('ModelSelector: selection routing', () => {
const onSelect = vi.fn();
const onLocked = vi.fn();
const freeAllowed = modelsForPlan(false);
- const options: ModelOption[] = (Object.values(Model) as TModel[]).map(
- (id) => ({ id, available: freeAllowed.includes(id) })
- );
+ const options: ModelOption[] = PAID_MODELS.map((id) => ({
+ id,
+ available: freeAllowed.includes(id),
+ }));
const { container } = render(() => (
<ModelSelector models={options} onSelect={onSelect} onLocked={onLocked} />
));
@@ -221,9 +234,10 @@ describe('ModelSelector: what is shown is what is sent', () => {
it('a free user cannot select an inaccessible model into the would-send value', () => {
const onLocked = vi.fn();
const freeAllowed = modelsForPlan(false);
- const options: ModelOption[] = (Object.values(Model) as TModel[]).map(
- (id) => ({ id, available: freeAllowed.includes(id) })
- );
+ const options: ModelOption[] = PAID_MODELS.map((id) => ({
+ id,
+ available: freeAllowed.includes(id),
+ }));
function FreeHarness() {
const [model, setModel] = createSignal<TModel>(Model.haiku45);
return (
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.tsx
index b065ab2f92..c6f8546e3b 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
@@ -5,6 +5,7 @@ import {
MODEL_PROVIDER_ICON,
Model,
modelUsageHint,
+ PAID_MODELS,
} from '@core/component/AI/constant';
import type { TModel } from '@core/component/AI/types';
import { DEV_MODE_ENV } from '@core/constant/featureFlags';
@@ -32,9 +33,10 @@ type ModelSelectorProps = {
compact?: boolean;
};
-const ALL_AVAILABLE: ModelOption[] = (Object.values(Model) as TModel[]).map(
- (id) => ({ id, available: true })
-);
+const ALL_AVAILABLE: ModelOption[] = PAID_MODELS.map((id) => ({
+ id,
+ available: true,
+}));
const MODEL_DESCRIPTION: Record<TModel, string> = {
[Model.sonnet5]: 'Everyday writing, coding, and questions',
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.ts
index e05ff0771e..e148bc386d 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
@@ -9,16 +9,17 @@ import {
Model,
modelsForPlan,
modelUsageHint,
+ PAID_MODELS,
type TModel,
} from './model';
const PROVIDER_OF = (m: TModel) => MODEL_PROVIDER[m];
describe('modelsForPlan / defaultModelForPlan', () => {
- it('gives paid users every model and an Anthropic-smart default', () => {
+ it('gives paid users every picker model and an Anthropic-smart default', () => {
const paid = modelsForPlan(true);
- // Every known model is selectable for a paid user.
- expect([...paid].sort()).toEqual([...Object.values(Model)].sort());
+ expect(paid).toEqual(PAID_MODELS);
+ expect(paid).not.toContain(Model.fable51);
expect(DEFAULT_MODEL).toBe(Model.sonnet5);
expect(defaultModelForPlan(true)).toBe(DEFAULT_MODEL);
});
@@ -42,10 +43,10 @@ describe('modelUsageHint', () => {
expect(modelUsageHint(Model.haiku45)).toBeUndefined();
});
- it('keeps Fable and Astra paid-only: free users see them locked, paid users select them', () => {
+ 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)).toContain(Model.fable51);
+ expect(modelsForPlan(true)).not.toContain(Model.fable51);
expect(modelsForPlan(true)).toContain(Model.gpt6Astra);
});
});
diff --git a/apps/web/src/lib/core/component/AI/constant/model.ts b/apps/web/src/lib/core/component/AI/constant/model.ts
index 0c96c28dcd..d64145d66d 100644
--- a/apps/web/src/lib/core/component/AI/constant/model.ts
+++ b/apps/web/src/lib/core/component/AI/constant/model.ts
@@ -23,6 +23,11 @@ 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;
};
@@ -84,8 +89,12 @@ export const DEFAULT_MODEL: TModel = Model.sonnet5;
*/
export const FREE_DEFAULT_MODEL: TModel = Model.haiku45;
-/** Models a paid user may select — the full set. */
-export const PAID_MODELS: readonly TModel[] = Object.values(Model);
+/**
+ * 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
@@ -150,9 +159,6 @@ export function alternateProviderModel(
excluded.add(MODEL_PROVIDER[current]);
const candidates = options?.candidates;
- const pool =
- candidates && candidates.length > 0
- ? candidates
- : (Object.values(Model) as readonly TModel[]);
+ const pool = candidates && candidates.length > 0 ? candidates : PAID_MODELS;
return pool.find((id) => !excluded.has(MODEL_PROVIDER[id]));
}