@@ -1,6 +1,6 @@
 # Model defaults and the model selector
 
-Every AI tool has a model selector. A new Pro account starts every tool on Claude Opus 5.5, and a Basic (trial) account on Claude Haiku 5.5. Pro-only models show a `Pro` badge and are disabled for Basic accounts. A setting saved with a retired catalog ID (Claude Sonnet 5 or Claude Opus 5) is rewritten to Claude Opus 5.5 on the next load, and the Edge Functions accept the retired ID from an older client and route it to Opus 5.5. The catalog and defaults live in `supabase/functions/_shared/model-catalog.ts`.
+Every AI tool has a model selector. A new Pro account starts every tool on Claude Opus 5.5, and a Basic (trial) account on Claude Haiku 5.5. Pro-only models show a `Pro` badge and are disabled for Basic accounts. A setting saved with a retired catalog ID is rewritten on the next load: GPT-5.6 Luna moves to Claude Haiku 5.5, Claude Sonnet 5 and Opus 5 to Claude Opus 5.5, GPT-5.6 Sol and Terra to GPT-6.1 Sol, and DeepSeek V4 Flash to DeepSeek V4.1 Flash. The Edge Functions resolve a retired ID from an older client the same way. A retired Basic ID never resolves to a Pro model. The catalog and defaults live in `supabase/functions/_shared/model-catalog.ts`.
 
 ## Sub-features
 
 
@@ -128,7 +128,7 @@ Supabase Auth owns user sessions. Protected routes provide a client navigation b
 
 Checkout and portal functions create Stripe sessions after authenticated ownership and redirect validation. The webhook updates subscription state and records event processing for idempotency. AI handlers record the provider-reported usage and charge for each request.
 
-All model requests use the single OpenRouter backend route and `OPENROUTER_API_KEY`. The shared eleven-model catalog, its defaults (Claude Haiku 5.5 for Basic, Claude Opus 5.5 for Pro), Pro-only entries, retired-ID successors, and request controls live in [`supabase/functions/_shared/model-catalog.ts`](../supabase/functions/_shared/model-catalog.ts). OpenRouter usage remains raw in the audit row, and the reported charge is unknown when the provider does not return a complete cost. The opponent's voice is the one exception to the OpenRouter route: the `voice` function calls ElevenLabs with `ELEVENLABS_API_KEY`. ElevenLabs reports billed characters, not dollars, so [`supabase/functions/_shared/cost.ts`](../supabase/functions/_shared/cost.ts) prices those rows from a dated list-price snapshot; promotions and plan credits are not modelled, so a voice row can overstate the charge.
+All model requests use the single OpenRouter backend route and `OPENROUTER_API_KEY`. The shared ten-model catalog, its defaults (Claude Haiku 5.5 for Basic, Claude Opus 5.5 for Pro), Pro-only entries, retired-ID successors, and request controls live in [`supabase/functions/_shared/model-catalog.ts`](../supabase/functions/_shared/model-catalog.ts). OpenRouter usage remains raw in the audit row, and the reported charge is unknown when the provider does not return a complete cost. The opponent's voice is the one exception to the OpenRouter route: the `voice` function calls ElevenLabs with `ELEVENLABS_API_KEY`. ElevenLabs reports billed characters, not dollars, so [`supabase/functions/_shared/cost.ts`](../supabase/functions/_shared/cost.ts) prices those rows from a dated list-price snapshot; promotions and plan credits are not modelled, so a voice row can overstate the charge.
 
 `Auto Fast` and `Auto Pro` are virtual selections, not provider model IDs. The Edge Functions resolve them through TypeSafe Jev on OpenRouter before calling the concrete writing model. Auto Fast is available to Basic accounts and normally resolves to Claude Haiku 5.5; it can also pick GLM 5.3 Flash, whose manual selection keeps its Pro restriction. Auto Pro remains Pro-only and normally resolves to Claude Opus 5.5. Provider calls, usage rows, and response metadata record the concrete resolved model, while response metadata also retains the requested automatic selection. A Jev router call uses the same OpenRouter key and does not consume a second daily quota unit.
 
 
@@ -86,7 +86,7 @@ OPENROUTER_API_KEY=... deno run --allow-read --allow-write --allow-env=OPENROUTE
   --allow-net=openrouter.ai scripts/prompt-examples.ts supabase/functions /tmp/after.json
 ```
 
-This sends the fourteen prompt examples to one real model (GPT-5.6 Luna by default) and writes the raw outputs for manual review. Point the first argument at a directory holding an older `_shared/prompts.ts` and `ai/prompt-builder.ts` to compare revisions. It runs no web research and is a bounded manual check, not a model matrix or an automated quality gate.
+This sends the fourteen prompt examples to one real model (GPT-6 Luna by default) and writes the raw outputs for manual review. Point the first argument at a directory holding an older `_shared/prompts.ts` and `ai/prompt-builder.ts` to compare revisions. It runs no web research and is a bounded manual check, not a model matrix or an automated quality gate.
 
 ### Live Jev contract smoke
 
 
@@ -11,7 +11,7 @@
 
 import { PROMPT_EXAMPLES } from "../supabase/functions/_shared/prompts/prompt-examples.ts";
 
-const [functionsDir, outPath, model = "openai/gpt-5.6-luna", only] = Deno.args;
+const [functionsDir, outPath, model = "openai/gpt-6-luna", only] = Deno.args;
 const selected = only ? new Set(only.split(",")) : null;
 if (!functionsDir || !outPath) {
   console.error("usage: prompt-examples.ts <functions-dir> <out.json> [model]");
 
@@ -932,7 +932,7 @@
     "trialFeature4": "3-day access",
     "proFeature1": "Expanded AI prep access",
     "proFeature2": "All 11 prep modes",
-    "proFeature3": "All 11 models, including Claude Opus and Sonnet, Muse Spark, and GLM Flash",
+    "proFeature3": "All 10 models, including Claude Opus and Sonnet, Muse Spark, and GLM Flash",
     "proFeature4": "Priority support",
     "proFeature5": "Active Grounding™ research",
     "startTrial": "Start Free Trial",
@@ -946,9 +946,9 @@
   "faq": {
     "title": "Frequently Asked Questions",
     "q1": "How much does DebateLab cost?",
-    "a1": "DebateLab offers a 3-day free trial. After that, Pro is $5/month + tax for expanded access and all 11 models.",
+    "a1": "DebateLab offers a 3-day free trial. After that, Pro is $5/month + tax for expanded access and all 10 models.",
     "q2": "What do I get with Pro?",
-    "a2": "Expanded AI prep access, all 11 models including Claude Opus and Sonnet, Muse Spark, and GLM Flash, Active Grounding™ research, and priority support.",
+    "a2": "Expanded AI prep access, all 10 models including Claude Opus and Sonnet, Muse Spark, and GLM Flash, Active Grounding™ research, and priority support.",
     "q3": "Can I cancel my subscription?",
     "a3": "Yes, you can cancel anytime from your Settings page. You'll retain access until the end of your billing period.",
     "q4": "Does the AI make things up?",
@@ -1356,7 +1356,7 @@
   },
   "pricingModal": {
     "title": "Upgrade to Pro",
-    "subtitle": "Unlock higher usage limits, all 11 models, and configurable reasoning.",
+    "subtitle": "Unlock higher usage limits, all 10 models, and configurable reasoning.",
     "free": "Free",
     "pro": "Pro",
     "current": "Current",
@@ -1370,7 +1370,7 @@
     "freeFeature3": "All debate features",
     "freeFeature4": "3-day free trial",
     "proFeature1": "Expanded AI prep access",
-    "proFeature2": "All 11 models, including Claude Opus and Sonnet, Muse Spark, and GLM Flash",
+    "proFeature2": "All 10 models, including Claude Opus and Sonnet, Muse Spark, and GLM Flash",
     "proFeature3": "Deep research with Exa",
     "proFeature4": "Priority processing",
     "proFeature5": "All debate features",
 
@@ -932,7 +932,7 @@
     "trialFeature4": "Acceso por 3 días",
     "proFeature1": "Acceso ampliado a preparación con IA",
     "proFeature2": "Las 11 herramientas de preparación",
-    "proFeature3": "Los 11 modelos, incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash",
+    "proFeature3": "Los 10 modelos, incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash",
     "proFeature4": "Soporte prioritario",
     "proFeature5": "Investigación Active Grounding™",
     "startTrial": "Comenzar Prueba Gratis",
@@ -946,9 +946,9 @@
   "faq": {
     "title": "Preguntas Frecuentes",
     "q1": "¿Cuánto cuesta DebateLab?",
-    "a1": "DebateLab ofrece una prueba gratis de 3 días. Después, Pro cuesta $5/mes + impuestos para acceso ampliado y los 11 modelos.",
+    "a1": "DebateLab ofrece una prueba gratis de 3 días. Después, Pro cuesta $5/mes + impuestos para acceso ampliado y los 10 modelos.",
     "q2": "¿Qué obtengo con Pro?",
-    "a2": "Acceso ampliado a preparación con IA, los 11 modelos incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash, investigación Active Grounding™ y soporte prioritario.",
+    "a2": "Acceso ampliado a preparación con IA, los 10 modelos incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash, investigación Active Grounding™ y soporte prioritario.",
     "q3": "¿Puedo cancelar mi suscripción?",
     "a3": "Sí, puedes cancelar en cualquier momento desde tu página de Ajustes. Mantendrás el acceso hasta el final de tu período de facturación.",
     "q4": "¿La IA inventa cosas?",
@@ -1356,7 +1356,7 @@
   },
   "pricingModal": {
     "title": "Actualizar a Pro",
-    "subtitle": "Desbloquea límites de uso más altos, los 11 modelos y razonamiento configurable.",
+    "subtitle": "Desbloquea límites de uso más altos, los 10 modelos y razonamiento configurable.",
     "free": "Gratis",
     "pro": "Pro",
     "current": "Actual",
@@ -1370,7 +1370,7 @@
     "freeFeature3": "Todas las funciones de debate",
     "freeFeature4": "Prueba gratis de 3 días",
     "proFeature1": "Acceso ampliado a preparación con IA",
-    "proFeature2": "Los 11 modelos, incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash",
+    "proFeature2": "Los 10 modelos, incluidos Claude Opus y Sonnet, Muse Spark y GLM Flash",
     "proFeature3": "Investigación profunda con Exa",
     "proFeature4": "Procesamiento prioritario",
     "proFeature5": "Todas las funciones de debate",
 
@@ -932,7 +932,7 @@
     "trialFeature4": "3 napos hozzáférés",
     "proFeature1": "Bővített MI felkészülési hozzáférés",
     "proFeature2": "Mind a 11 felkészülési eszköz",
-    "proFeature3": "Mind a 11 modell, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash",
+    "proFeature3": "Mind a 10 modell, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash",
     "proFeature4": "Elsőbbségi támogatás",
     "proFeature5": "Active Grounding™ kutatás",
     "startTrial": "Ingyenes Próba Indítása",
@@ -946,9 +946,9 @@
   "faq": {
     "title": "Gyakran Ismételt Kérdések",
     "q1": "Mennyibe kerül a DebateLab?",
-    "a1": "A DebateLab 3 napos ingyenes próbát kínál. Ezután a Pro $5/hó + adó bővített hozzáférést és mind a 11 modellt kínálja.",
+    "a1": "A DebateLab 3 napos ingyenes próbát kínál. Ezután a Pro $5/hó + adó bővített hozzáférést és mind a 10 modellt kínálja.",
     "q2": "Mit kapok a Pro-val?",
-    "a2": "Bővített MI felkészülési hozzáférés mind a 11 modellel, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash modellekkel, Active Grounding™ kutatással és elsőbbségi támogatással.",
+    "a2": "Bővített MI felkészülési hozzáférés mind a 10 modellel, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash modellekkel, Active Grounding™ kutatással és elsőbbségi támogatással.",
     "q3": "Lemondhatom az előfizetésem?",
     "a3": "Igen, bármikor lemondhatod a Beállítások oldalon. A számlázási időszak végéig megtartod a hozzáférést.",
     "q4": "Az MI kitalál dolgokat?",
@@ -1356,7 +1356,7 @@
   },
   "pricingModal": {
     "title": "Frissítés Pro-ra",
-    "subtitle": "Oldd fel a magasabb használati keretet, mind a 11 modellt és a beállítható érvelést.",
+    "subtitle": "Oldd fel a magasabb használati keretet, mind a 10 modellt és a beállítható érvelést.",
     "free": "Ingyenes",
     "pro": "Pro",
     "current": "Jelenlegi",
@@ -1370,7 +1370,7 @@
     "freeFeature3": "Minden vitafunkció",
     "freeFeature4": "3 napos ingyenes próba",
     "proFeature1": "Bővített MI felkészülési hozzáférés",
-    "proFeature2": "Mind a 11 modell, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash",
+    "proFeature2": "Mind a 10 modell, köztük a Claude Opus és Sonnet, a Muse Spark és a GLM Flash",
     "proFeature3": "Mélyreható kutatás Exa-val",
     "proFeature4": "Elsőbbségi feldolgozás",
     "proFeature5": "Minden vitafunkció",
 
@@ -88,38 +88,38 @@ describe('AI streaming helpers', () => {
   });
 
   it('enables streaming for basic OpenRouter ask chats', () => {
-    expect(isAskStreamingSupported({ provider: 'openrouter', model: 'openai/gpt-5.6-luna' })).toBe(true);
+    expect(isAskStreamingSupported({ provider: 'openrouter', model: 'openai/gpt-6-luna' })).toBe(true);
     expect(isAskStreamingSupported({ provider: 'openai', model: 'gpt-5.4-mini' })).toBe(false);
     expect(isAskStreamingSupported({ provider: 'google', model: 'gemini-3-flash-preview' })).toBe(false);
     expect(isAskStreamingSupported({ provider: 'anthropic', model: 'claude-haiku-4-5-20251001' })).toBe(false);
     expect(isAskStreamingSupported({ provider: 'unknown' as string, model: 'x' })).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { citationMode: true }
     )).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { webSearch: true }
     )).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { prosConsMode: true }
     )).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { argumentMapMode: true }
     )).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { mode: 'clarify' }
     )).toBe(false);
     expect(isAskStreamingSupported(
-      { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+      { provider: 'openrouter', model: 'openai/gpt-6-luna' },
       { mode: 'general' }
     )).toBe(true);
     for (const mode of ['clarify', 'summarize', 'proscons', 'argumentmap']) {
       expect(isAskStreamingSupported(
-        { provider: 'openrouter', model: 'openai/gpt-5.6-luna' },
+        { provider: 'openrouter', model: 'openai/gpt-6-luna' },
         { mode }
       )).toBe(false);
     }
 
@@ -128,7 +128,7 @@ describe('Current Debate context in requests and the Review control', () => {
   });
 
   const brainstormInput = { motion: 'This House would make public transport free', side: 'pro' as const, outputMode: 'topfive' as const, language: 'en' };
-  const config = { provider: 'openrouter' as const, model: 'openai/gpt-5.6-luna' };
+  const config = { provider: 'openrouter' as const, model: 'openai/gpt-6-luna' };
   const lastBody = () => (supabaseMock.functions.invoke.mock.calls.at(-1) as unknown as [string, { body: Record<string, unknown> }])[1].body;
 
   it('sends IDs only, and a Review choice lasts for exactly one successful request', async () => {
 
@@ -76,7 +76,7 @@ describe('security hardening regressions', () => {
   it('uses allowlisted model/provider pairs and SSRF-safe citation verification', () => {
     expect(modelCatalog).toContain('id: "z-ai/glm-5.3-flash"');
     expect(modelCatalog).toContain('id: "anthropic/claude-haiku-5.5"');
-    expect(modelCatalog).toContain('id: "openai/gpt-5.6-luna"');
+    expect(modelCatalog).toContain('id: "openai/gpt-6-luna"');
     expect(modelCatalog).toContain('id: "google/gemini-3.8-flash"');
     expect(ai).toContain('function modelForRequest');
     expect(stream).toContain('isModelSelection(rawModel)');