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): make Sonnet 5 the paid default (#4844)
Eric Hayes9b5ba74bdaef
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 95ea87e3f5..cfb91098a4 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@@ -18,6 +18,7 @@ describe('modelsForPlan / defaultModelForPlan', () => {const paid = modelsForPlan(true);// Every known model is selectable for a paid user.expect([...paid].sort()).toEqual([...Object.values(Model)].sort());+ expect(DEFAULT_MODEL).toBe(Model.sonnet5);expect(defaultModelForPlan(true)).toBe(DEFAULT_MODEL);});diff --git a/apps/web/src/lib/core/component/AI/constant/model.ts b/apps/web/src/lib/core/component/AI/constant/model.tsindex b1a6576bed..0080e0f055 100644--- a/apps/web/src/lib/core/component/AI/constant/model.ts+++ b/apps/web/src/lib/core/component/AI/constant/model.ts@@ -9,6 +9,7 @@ import OpenAiIcon from '@core/component/AI/assets/openai.svg';* strings.*/export const Model = {+ sonnet5: 'anthropic/claude-sonnet-5',opus48: 'anthropic/claude-opus-4-8',haiku45: 'anthropic/claude-haiku-4-5',sonnet46: 'anthropic/claude-sonnet-4-6',@@ -26,6 +27,7 @@ type ExhaustiveMap = {};export const MODEL_PRETTYNAME: ExhaustiveMap = {+ 'anthropic/claude-sonnet-5': 'Sonnet 5','anthropic/claude-opus-4-8': 'Opus 4.8','anthropic/claude-haiku-4-5': 'Haiku 4.5','anthropic/claude-sonnet-4-6': 'Sonnet 4.6',@@ -34,6 +36,7 @@ export const MODEL_PRETTYNAME: ExhaustiveMap = {} as const;export const MODEL_PROVIDER_ICON: ExhaustiveMap = {+ 'anthropic/claude-sonnet-5': AnthropicIcon,'anthropic/claude-opus-4-8': AnthropicIcon,'anthropic/claude-haiku-4-5': AnthropicIcon,'anthropic/claude-sonnet-4-6': AnthropicIcon,@@ -42,7 +45,7 @@ export const MODEL_PROVIDER_ICON: ExhaustiveMap = {};/** Default model for paid users. */-export const DEFAULT_MODEL: TModel = Model.opus48;+export const DEFAULT_MODEL: TModel = Model.sonnet5;/*** Default model for free users. Free users aren't entitled to the premium@@ -74,6 +77,7 @@ export function modelsForPlan(hasPaidAccess: boolean): readonly TModel[] {/** Provider serving each model — mirrors the backend `provider` field. */export const MODEL_PROVIDER: ExhaustiveMap = {+ 'anthropic/claude-sonnet-5': 'anthropic','anthropic/claude-opus-4-8': 'anthropic','anthropic/claude-haiku-4-5': 'anthropic','anthropic/claude-sonnet-4-6': 'anthropic',diff --git a/crates/agent/src/model/predefined_model.rs b/crates/agent/src/model/predefined_model.rsindex 2d302ebeb2..5c546bcf11 100644--- a/crates/agent/src/model/predefined_model.rs+++ b/crates/agent/src/model/predefined_model.rs@@ -11,6 +11,7 @@ use utoipa::ToSchema;static ANTHROPIC: &str = "anthropic";static OPENAI: &str = "openai";+const CLAUDE_SONNET_5: &str = "claude-sonnet-5";/// This type is **serialize-only**: every variant's wire form is the/// provider's **api id** — the exact string the API (and the model router)@@ -31,6 +32,9 @@ pub enum PredefinedModel {/// Claude Opus 4.7#[serde(rename = "claude-opus-4-7")]Opus4_7,+ /// Claude Sonnet 5+ #[serde(rename = "claude-sonnet-5")]+ Sonnet5,/// Claude Sonnet 4.6#[serde(rename = "claude-sonnet-4-6")]Sonnet4_6,@@ -53,6 +57,7 @@ impl From<PredefinedModel> for super::types::Model<'static> {let (provider, name) = match model {PredefinedModel::Smart | PredefinedModel::Retired => (ANTHROPIC, CLAUDE_OPUS_4_8),PredefinedModel::Opus4_7 => (ANTHROPIC, CLAUDE_OPUS_4_7),+ PredefinedModel::Sonnet5 => (ANTHROPIC, CLAUDE_SONNET_5),PredefinedModel::Sonnet4_6 => (ANTHROPIC, CLAUDE_SONNET_4_6),PredefinedModel::Fast | PredefinedModel::Haiku4_5 => (ANTHROPIC, CLAUDE_HAIKU_4_5),PredefinedModel::Gpt5_5 => (OPENAI, GPT_5_5),@@ -69,6 +74,7 @@ impl PredefinedModel {/// Returns `additional_params` JSON to enable extended thinking / reasoning.////// - Opus 4.8 / 4.7: `adaptive` (model chooses when to think)+ /// - Sonnet 5: `adaptive` (manual extended thinking is unsupported)/// - Sonnet 4.6 / Haiku 4.5: `enabled` with `budget_tokens`/// - GPT-5.5 / GPT-5 mini: Responses API `reasoning` with effort/// (no `temperature`; reasoning models reject it)@@ -78,6 +84,9 @@ impl PredefinedModel {"thinking": { "type": "adaptive", "display": "summarized" },"temperature": 1}),+ Self::Sonnet5 => serde_json::json!({+ "thinking": { "type": "adaptive", "display": "summarized" }+ }),Self::Sonnet4_6 | Self::Fast | Self::Haiku4_5 => serde_json::json!({"thinking": {"type": "enabled",@@ -98,7 +107,9 @@ impl PredefinedModel {/// Context window size in tokens.pub fn context_window(&self) -> u64 {match self {- Self::Smart | Self::Opus4_7 | Self::Sonnet4_6 | Self::Retired => 1_000_000,+ Self::Smart | Self::Opus4_7 | Self::Sonnet5 | Self::Sonnet4_6 | Self::Retired => {+ 1_000_000+ }Self::Fast | Self::Haiku4_5 => 200_000,Self::Gpt5_5 | Self::Gpt5Mini => 400_000,}diff --git a/crates/agent/src/test/test_predefined_model.rs b/crates/agent/src/test/test_predefined_model.rsindex 0bc8425e9d..07ce1528d8 100644--- a/crates/agent/src/test/test_predefined_model.rs+++ b/crates/agent/src/test/test_predefined_model.rs@@ -54,6 +54,14 @@ fn variants_serialize_to_their_api_id() {}assert_eq!(PredefinedModel::Opus4_7.to_string(), ant(CLAUDE_OPUS_4_7));+ assert_eq!(+ PredefinedModel::Sonnet5.to_string(),+ "anthropic/claude-sonnet-5"+ );+ assert_eq!(+ serde_json::to_string(&PredefinedModel::Sonnet5).unwrap(),+ r#""claude-sonnet-5""#+ );assert_eq!(PredefinedModel::Haiku4_5.to_string(), ant(CLAUDE_HAIKU_4_5));assert_eq!(PredefinedModel::Sonnet4_6.to_string(),@@ -64,3 +72,12 @@ fn variants_serialize_to_their_api_id() {format!("openai/{}", GPT_5_5));}++#[test]+fn sonnet_5_uses_adaptive_thinking() {+ let params = PredefinedModel::Sonnet5.thinking_params();+ assert_eq!(params["thinking"]["type"], "adaptive");+ assert!(params["thinking"].get("budget_tokens").is_none());+ assert!(params.get("temperature").is_none());+ assert_eq!(PredefinedModel::Sonnet5.context_window(), 1_000_000);+}diff --git a/crates/chat/src/domain/models/mod.rs b/crates/chat/src/domain/models/mod.rsindex a8e75fec23..a9dc652fcb 100644--- a/crates/chat/src/domain/models/mod.rs+++ b/crates/chat/src/domain/models/mod.rs@@ -8,4 +8,4 @@ pub mod model_access;pub use chat::{ChatResponse, CopyChatArgs, CreateChatArgs, GetChatResponse, PatchChatArgs};pub use error::{ChatErr, Result};pub use message::{PatchChatMessageArgs, ResolvedMessageContent, WebCitation};-pub use model_access::{CHAT_MODELS, FREE_MODEL};+pub use model_access::{CHAT_MODELS, FREE_MODEL, PAID_DEFAULT_MODEL};diff --git a/crates/chat/src/domain/models/model_access.rs b/crates/chat/src/domain/models/model_access.rsindex 69afe95949..4079eba439 100644--- a/crates/chat/src/domain/models/model_access.rs+++ b/crates/chat/src/domain/models/model_access.rs@@ -5,6 +5,7 @@/// The chat models offered to users, best-first.pub const CHAT_MODELS: &[&str] = &[+ "anthropic/claude-sonnet-5","anthropic/claude-opus-4-8","anthropic/claude-haiku-4-5","anthropic/claude-opus-4-7",@@ -13,5 +14,8 @@ pub const CHAT_MODELS: &[&str] = &["openai/gpt-5-mini",];+/// The default model for professional (paid) users.+pub const PAID_DEFAULT_MODEL: &str = "anthropic/claude-sonnet-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/ports/model_access.rs b/crates/chat/src/domain/ports/model_access.rsindex d6f3a989a2..d067452fe1 100644--- a/crates/chat/src/domain/ports/model_access.rs+++ b/crates/chat/src/domain/ports/model_access.rs@@ -4,6 +4,9 @@/// Pure domain logic with no I/O, so it can be called directly (e.g. from DCS/// to validate a requested model).pub trait ModelAccessService: Send + Sync + 'static {+ /// The default model for a `professional` (`true`) or free (`false`) user.+ fn best_model(&self, professional: bool) -> &'static str;+/// Whether a `professional` (`true`) or free (`false`) user may use the/// provider-qualified model identified by `model_id`. Unknown ids return/// `false`.diff --git a/crates/chat/src/domain/service/model_access.rs b/crates/chat/src/domain/service/model_access.rsindex 97a3b1612a..ba31bce38c 100644--- a/crates/chat/src/domain/service/model_access.rs+++ b/crates/chat/src/domain/service/model_access.rs@@ -1,4 +1,4 @@-use crate::domain::models::model_access::FREE_MODEL;+use crate::domain::models::model_access::{FREE_MODEL, PAID_DEFAULT_MODEL};use crate::domain::ports::ModelAccessService;/// Default [`ModelAccessService`]: free users get only [`FREE_MODEL`],@@ -7,6 +7,14 @@ use crate::domain::ports::ModelAccessService;pub struct ModelAccessServiceImpl;impl ModelAccessService for ModelAccessServiceImpl {+ fn best_model(&self, professional: bool) -> &'static str {+ if professional {+ PAID_DEFAULT_MODEL+ } else {+ FREE_MODEL+ }+ }+fn has_access(&self, professional: bool, model_id: &str) -> bool {professional || model_id == FREE_MODEL}diff --git a/crates/chat/src/domain/service/model_access/test.rs b/crates/chat/src/domain/service/model_access/test.rsindex 10be7f52bb..e6a8c14377 100644--- a/crates/chat/src/domain/service/model_access/test.rs+++ b/crates/chat/src/domain/service/model_access/test.rs@@ -1,6 +1,7 @@use super::*;const HAIKU: &str = "anthropic/claude-haiku-4-5";+const SONNET_5: &str = "anthropic/claude-sonnet-5";const OPUS: &str = "anthropic/claude-opus-4-8";const OPUS_4_7: &str = "anthropic/claude-opus-4-7";const SONNET_4_6: &str = "anthropic/claude-sonnet-4-6";@@ -10,6 +11,7 @@ const GPT_5_MINI: &str = "openai/gpt-5-mini";#[test]fn free_user_only_has_haiku() {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));@@ -19,6 +21,8 @@ fn free_user_only_has_haiku() {#[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));diff --git a/crates/chat/src/inbound/http/extractors.rs b/crates/chat/src/inbound/http/extractors.rsindex c03e3ab398..17b61986a4 100644--- a/crates/chat/src/inbound/http/extractors.rs+++ b/crates/chat/src/inbound/http/extractors.rs@@ -1,6 +1,5 @@//! Axum extractors for chat inbound handlers.-use crate::domain::models::FREE_MODEL;use crate::domain::ports::ModelAccessService;use crate::domain::service::ModelAccessServiceImpl;use axum::extract::FromRequestParts;@@ -34,11 +33,7 @@ impl ChatModelAccess {/// The default model for this user — the best one they're entitled to.pub fn best_model(&self) -> &'static str {- if self.professional {- "anthropic/claude-opus-4-8"- } else {- FREE_MODEL- }+ ModelAccessServiceImpl.best_model(self.professional)}}@@ -84,6 +79,7 @@ impl<S: Send + Sync> FromRequestParts<S> for ChatModelAccess {#[cfg(test)]mod test {use super::*;+ use crate::domain::models::FREE_MODEL;fn access(permissions: &[PermissionId]) -> ChatModelAccess {let professional = permissions.contains(&PermissionId::ReadProfessionalFeatures);@@ -121,7 +117,8 @@ mod test {#[test]fn professional_user_defaults_to_smart_and_has_everything() {let pro = access(&[PermissionId::ReadProfessionalFeatures]);- assert_eq!(pro.best_model(), "anthropic/claude-opus-4-8");+ assert_eq!(pro.best_model(), "anthropic/claude-sonnet-5");+ assert!(pro.has_access("anthropic/claude-sonnet-5"));assert!(pro.has_access("anthropic/claude-opus-4-8"));assert!(pro.has_access(FREE_MODEL));assert!(pro.has_access("openai/gpt-5.5"));