@aibridge/cli 0.3.0 → 0.5.0

package/src/commands/models/impl.test.ts

@@ -0,0 +1,89 @@
+import { describe, expect, it } from 'vitest';
+import type { LocalContext } from '../../context.ts';
+import { MODELS } from '../../models.ts';
+import modelsImpl from './impl.ts';
+
+function createTestContext() {
+  let stdoutText = '';
+  const fakeProcess = {
+    stdout: {
+      write(chunk: string | Uint8Array) {
+        stdoutText += chunk.toString();
+        return true;
+      },
+    },
+    stderr: {
+      write() {
+        return true;
+      },
+    },
+    exitCode: 0,
+  } as unknown as NodeJS.Process;
+
+  return {
+    ctx: { process: fakeProcess } as LocalContext,
+    getStdout: () => stdoutText,
+  };
+}
+
+describe('modelsImpl', () => {
+  it('--json emits parseable JSON with one entry per key of MODELS, with seven documented fields', () => {
+    const { ctx, getStdout } = createTestContext();
+    modelsImpl.call(ctx, { json: true });
+
+    const raw = getStdout();
+    const data = JSON.parse(raw);
+
+    expect(Array.isArray(data)).toBe(true);
+    expect(data.length).toBe(Object.keys(MODELS).length);
+
+    for (const item of data) {
+      expect(item).toHaveProperty('slug');
+      expect(item).toHaveProperty('backend');
+      expect(item).toHaveProperty('backendModel');
+      expect(item).toHaveProperty('efforts');
+      expect(item).toHaveProperty('defaultEffort');
+      expect(item).toHaveProperty('image');
+      expect(item).toHaveProperty('brief');
+      expect(Object.keys(item)).toHaveLength(7);
+    }
+  });
+
+  it('reports efforts: ["low", "high"] and defaultEffort: "high" for gemini-3.1-pro in JSON', () => {
+    const { ctx, getStdout } = createTestContext();
+    modelsImpl.call(ctx, { json: true });
+
+    const data = JSON.parse(getStdout());
+    const geminiPro = data.find(
+      (item: { slug: string }) => item.slug === 'google-antigravity/gemini-3.1-pro',
+    );
+    expect(geminiPro).toBeDefined();
+    expect(geminiPro.efforts).toEqual(['low', 'high']);
+    expect(geminiPro.defaultEffort).toBe('high');
+  });
+
+  it('reports backendModel and image correctly for opus-5 and gpt-5.6-sol in JSON', () => {
+    const { ctx, getStdout } = createTestContext();
+    modelsImpl.call(ctx, { json: true });
+
+    const data = JSON.parse(getStdout());
+    const opus = data.find((item: { slug: string }) => item.slug === 'anthropic-claude/opus-5');
+    expect(opus).toBeDefined();
+    expect(opus.backendModel).toBe('claude-opus-5[1m]');
+    expect(opus.image).toBeNull();
+
+    const sol = data.find((item: { slug: string }) => item.slug === 'openai-codex/gpt-5.6-sol');
+    expect(sol).toBeDefined();
+    expect(sol.image).toBe('png');
+  });
+
+  it('human output (no --json) contains every slug in MODELS', () => {
+    const { ctx, getStdout } = createTestContext();
+    modelsImpl.call(ctx, { json: false });
+
+    const output = getStdout();
+    for (const slug of Object.keys(MODELS)) {
+      expect(output).toContain(slug);
+    }
+  });
+});

package/src/commands/models/impl.ts

@@ -0,0 +1,71 @@
+import type { LocalContext } from '../../context.ts';
+import { type Backend, imageFormatFor, MODELS } from '../../models.ts';
+
+export interface ModelsFlags {
+  readonly json: boolean;
+}
+
+const BACKEND_DISPLAY_NAMES: Record<Backend, string> = {
+  grok: 'grok (Grok CLI)',
+  agy: 'agy (Antigravity)',
+  codex: 'codex (Codex CLI)',
+  claude: 'claude (Claude Code CLI)',
+};
+
+export default function modelsImpl(this: LocalContext, flags: ModelsFlags): void {
+  const specs = Object.values(MODELS);
+
+  if (flags.json) {
+    const jsonOutput = specs.map(spec => ({
+      slug: spec.slug,
+      backend: spec.backend,
+      backendModel: spec.backendModel,
+      efforts: spec.efforts ? [...spec.efforts] : [],
+      defaultEffort: spec.defaultEffort ?? null,
+      image: imageFormatFor({ spec, effort: undefined }) ?? null,
+      brief: spec.brief,
+    }));
+    this.process.stdout.write(`${JSON.stringify(jsonOutput)}\n`);
+    return;
+  }
+
+  const backends: Backend[] = [];
+  for (const spec of specs) {
+    if (!backends.includes(spec.backend)) {
+      backends.push(spec.backend);
+    }
+  }
+
+  let firstBackend = true;
+  for (const backend of backends) {
+    if (!firstBackend) {
+      this.process.stdout.write('\n');
+    }
+    firstBackend = false;
+
+    this.process.stdout.write(`=== ${BACKEND_DISPLAY_NAMES[backend]} ===\n`);
+    const backendSpecs = specs.filter(spec => spec.backend === backend);
+    for (const spec of backendSpecs) {
+      this.process.stdout.write(`  ${spec.slug}\n`);
+
+      const segments: string[] = [];
+      if (spec.efforts) {
+        const formattedEfforts = spec.efforts
+          .map(e => (e === spec.defaultEffort ? `${e}*` : e))
+          .join(' | ');
+        segments.push(`efforts: ${formattedEfforts}`);
+      }
+      const img = imageFormatFor({ spec, effort: undefined });
+      segments.push(`image: ${img ?? '—'}`);
+      segments.push(`id: ${spec.backendModel}`);
+
+      this.process.stdout.write(`    ${segments.join(' · ')}\n`);
+      this.process.stdout.write(`    ${spec.brief}\n`);
+    }
+  }
+
+  const hasDefaultEffort = specs.some(spec => spec.defaultEffort !== undefined);
+  if (hasDefaultEffort) {
+    this.process.stdout.write('\n* = effort used when the slug has no -<effort> suffix\n');
+  }
+}

package/src/commands/quota/command.ts

@@ -2,6 +2,8 @@ import { buildCommand } from '@stricli/core';
 import quotaImpl from './impl.ts';
 
 const fullDescription = [
+  'grok: reads ~/.grok/auth.json and asks the xAI billing endpoint for the',
+  'weekly credit usage percentage and per-product split.',
   'agy: reads its cached OAuth token (~/.gemini/antigravity-cli/) and asks the',
   'Cloud Code API for per-model remaining quota. EXHAUSTED means agy turns on',
   'that model fail with an empty answer until the reset time.',
@@ -24,7 +26,7 @@ export const quota = buildCommand({
     },
   },
   docs: {
-    brief: 'Show agy / codex / claude quota with reset times',
+    brief: 'Show grok / agy / codex / claude quota with reset times',
     fullDescription,
   },
 });

package/src/commands/quota/impl.ts

@@ -1,6 +1,7 @@
 import { type AgyQuotaSnapshot, fetchAgyQuota } from '@aibridge/driver-agy';
 import { type ClaudeQuotaSnapshot, fetchClaudeQuota } from '@aibridge/driver-claude';
 import { type CodexQuotaSnapshot, fetchCodexQuota } from '@aibridge/driver-codex';
+import { fetchGrokQuota, type GrokQuotaSnapshot } from '@aibridge/driver-grok';
 import type { LocalContext } from '../../context.ts';
 
 export interface QuotaFlags {
@@ -17,6 +18,20 @@ function formatReset(resetTime: string | undefined): string {
   return `${new Date(resetTime).toLocaleTimeString()} (in ${rel})`;
 }
 
+function renderGrok(ctx: LocalContext, snapshot: GrokQuotaSnapshot): void {
+  ctx.process.stdout.write('=== grok (xAI) — used this period ===\n');
+  ctx.process.stdout.write(`${'PERIOD'.padEnd(10)} ${'USED'.padEnd(10)} RESET\n`);
+  const usedPctStr = snapshot.usedPercent !== undefined ? `${snapshot.usedPercent}%` : '?';
+  const periodStr = snapshot.periodType ?? '-';
+  ctx.process.stdout.write(
+    `${periodStr.padEnd(10)} ${usedPctStr.padEnd(10)} ${formatReset(snapshot.periodEnd)}\n`,
+  );
+  if (snapshot.products.length > 0) {
+    const prods = snapshot.products.map(p => `${p.product} ${p.usedPercent}%`).join(' · ');
+    ctx.process.stdout.write(`  ${prods}\n`);
+  }
+}
+
 function renderAgy(ctx: LocalContext, snapshot: AgyQuotaSnapshot): void {
   ctx.process.stdout.write('=== agy (Antigravity) — remaining per model group ===\n');
   for (const group of snapshot.groups) {
@@ -75,19 +90,24 @@ function renderSection<T>(
 }
 
 export default async function quotaImpl(this: LocalContext, flags: QuotaFlags): Promise<void> {
-  const [agy, codex, claude] = await Promise.allSettled([
+  const [grok, agy, codex, claude] = await Promise.allSettled([
+    fetchGrokQuota(),
     fetchAgyQuota(),
     fetchCodexQuota(),
     fetchClaudeQuota(),
   ]);
 
   const allFailed =
-    agy.status === 'rejected' && codex.status === 'rejected' && claude.status === 'rejected';
+    grok.status === 'rejected' &&
+    agy.status === 'rejected' &&
+    codex.status === 'rejected' &&
+    claude.status === 'rejected';
 
   if (flags.json) {
     this.process.stdout.write(
       `${JSON.stringify(
         {
+          grok: grok.status === 'fulfilled' ? grok.value : { error: String(grok.reason) },
           agy: agy.status === 'fulfilled' ? agy.value : { error: String(agy.reason) },
           codex: codex.status === 'fulfilled' ? codex.value : { error: String(codex.reason) },
           claude: claude.status === 'fulfilled' ? claude.value : { error: String(claude.reason) },
@@ -100,6 +120,8 @@ export default async function quotaImpl(this: LocalContext, flags: QuotaFlags):
     return;
   }
 
+  renderSection(this, grok, 'grok (xAI)', renderGrok);
+  this.process.stdout.write('\n');
   renderSection(this, agy, 'agy (Antigravity)', renderAgy);
   this.process.stdout.write('\n');
   renderSection(this, codex, 'codex (ChatGPT)', renderCodex);

package/src/commands/subagent/command.ts

@@ -8,8 +8,8 @@ const fullDescription = [
   '',
   'Available models (canonical slug):',
   ...listModelHelpLines(),
-  'Recommended first choice: xai-grok/grok-4.5 (off-budget). The claude-backend slugs are FALLBACKS for',
-  'when the off-budget CLIs are quota-exhausted — they bill your Claude subscription.',
+  'Recommended first choice: xai-grok/grok-4.6. Whichever seat runs on the same provider as the',
+  'agent you orchestrate from is your last resort — it spends the pool you are already burning.',
 ].join('\n');
 
 export const subagent = buildCommand({

package/src/delegate.test.ts

@@ -64,7 +64,7 @@ function createRecordingRunLog() {
 }
 
 describe('delegate stub-driver tests', () => {
-  const model = resolveModel('xai-grok/grok-4.5');
+  const model = resolveModel('xai-grok/grok-4.6');
   if (!model) throw new Error('model resolution failed');
 
   it('prepends preamble when tools: true, passes untouched when tools: false', async () => {

package/src/driver.ts

@@ -1,6 +1,7 @@
 import type { AgyQuotaSnapshot } from '@aibridge/driver-agy';
 import type { ClaudeQuotaSnapshot } from '@aibridge/driver-claude';
 import type { CodexQuotaSnapshot } from '@aibridge/driver-codex';
+import type { GrokQuotaSnapshot } from '@aibridge/driver-grok';
 import type { Effort } from './models.ts';
 
 export type Availability =
@@ -28,7 +29,11 @@ export type DelegationResult =
       readonly exitCode: number | null;
     };
 
-export type QuotaSnapshot = AgyQuotaSnapshot | CodexQuotaSnapshot | ClaudeQuotaSnapshot;
+export type QuotaSnapshot =
+  | AgyQuotaSnapshot
+  | CodexQuotaSnapshot
+  | ClaudeQuotaSnapshot
+  | GrokQuotaSnapshot;
 
 export interface ImageGenRequest {
   readonly prompt: string;

package/src/drivers.ts

@@ -15,6 +15,7 @@ const agyDriver: AgentCliDriver = {
 const grokDriver: AgentCliDriver = {
   probe: () => grok.probe(),
   run: task => grok.run(task),
+  quota: () => grok.fetchGrokQuota(),
   generateImage: req => grok.generateImage(req),
 };
 

package/src/flagMapping.test.ts

@@ -35,7 +35,7 @@ describe('flag mapping & defaults lock', () => {
   it('plan command maps defaults correctly', async () => {
     mockPlanImpl.mockReset();
     const ctx = fakeCtx();
-    await runCli(ctx, ['plan', '--model', 'xai-grok/grok-4.5', '--out', 'plan.md', 'do something']);
+    await runCli(ctx, ['plan', '--model', 'xai-grok/grok-4.6', '--out', 'plan.md', 'do something']);
     expect(mockPlanImpl).toHaveBeenCalledTimes(1);
     const [call] = mockPlanImpl.mock.calls;
     expect(call).toBeDefined();
@@ -43,7 +43,7 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('do something');
     expect(flags).toEqual({
-      model: 'xai-grok/grok-4.5',
+      model: 'xai-grok/grok-4.6',
       out: 'plan.md',
       preflight: true,
     });
@@ -55,7 +55,7 @@ describe('flag mapping & defaults lock', () => {
     await runCli(ctx, [
       'plan',
       '--model',
-      'xai-grok/grok-4.5',
+      'xai-grok/grok-4.6',
       '--out',
       'plan.md',
       '--no-preflight',
@@ -70,7 +70,7 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('task');
     expect(flags).toEqual({
-      model: 'xai-grok/grok-4.5',
+      model: 'xai-grok/grok-4.6',
       out: 'plan.md',
       preflight: false,
       timeout: 120,
@@ -80,7 +80,7 @@ describe('flag mapping & defaults lock', () => {
   it('subagent command maps defaults correctly', async () => {
     mockSubagentImpl.mockReset();
     const ctx = fakeCtx();
-    await runCli(ctx, ['subagent', '--model', 'xai-grok/grok-4.5', 'hello agent']);
+    await runCli(ctx, ['subagent', '--model', 'xai-grok/grok-4.6', 'hello agent']);
     expect(mockSubagentImpl).toHaveBeenCalledTimes(1);
     const [call] = mockSubagentImpl.mock.calls;
     expect(call).toBeDefined();
@@ -88,7 +88,7 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('hello agent');
     expect(flags).toEqual({
-      model: 'xai-grok/grok-4.5',
+      model: 'xai-grok/grok-4.6',
       tools: true,
       preflight: true,
       json: false,
@@ -101,7 +101,7 @@ describe('flag mapping & defaults lock', () => {
     await runCli(ctx, [
       'subagent',
       '--model',
-      'xai-grok/grok-4.5',
+      'xai-grok/grok-4.6',
       '--no-tools',
       '--no-preflight',
       'hello agent',
@@ -113,7 +113,7 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('hello agent');
     expect(flags).toEqual({
-      model: 'xai-grok/grok-4.5',
+      model: 'xai-grok/grok-4.6',
       tools: false,
       preflight: false,
       json: false,

package/src/models.test.ts

@@ -10,14 +10,14 @@ import {
 
 describe('models registry', () => {
   it('resolves canonical slugs', () => {
-    const grok = resolveModel('xai-grok/grok-4.5');
+    const grok = resolveModel('xai-grok/grok-4.6');
     expect(grok).toBeDefined();
-    expect(grok?.spec.slug).toBe('xai-grok/grok-4.5');
+    expect(grok?.spec.slug).toBe('xai-grok/grok-4.6');
     expect(grok?.effort).toBeUndefined();
 
-    const gemini = resolveModel('google-antigravity/gemini-3.6-flash');
+    const gemini = resolveModel('google-antigravity/gemini-3.7-flash');
     expect(gemini).toBeDefined();
-    expect(gemini?.spec.slug).toBe('google-antigravity/gemini-3.6-flash');
+    expect(gemini?.spec.slug).toBe('google-antigravity/gemini-3.7-flash');
     expect(gemini?.effort).toBe('high');
   });
 
@@ -38,8 +38,8 @@ describe('models registry', () => {
   });
 
   it('resolves effort suffixes', () => {
-    const grokMedium = resolveModel('xai-grok/grok-4.5-medium');
-    expect(grokMedium?.spec.slug).toBe('xai-grok/grok-4.5');
+    const grokMedium = resolveModel('xai-grok/grok-4.6-medium');
+    expect(grokMedium?.spec.slug).toBe('xai-grok/grok-4.6');
     expect(grokMedium?.effort).toBe('medium');
 
     const sonnetMax = resolveModel('anthropic-claude/sonnet-5-max');
@@ -48,7 +48,7 @@ describe('models registry', () => {
   });
 
   it('rejects unsupported efforts', () => {
-    const grokXhigh = resolveModel('xai-grok/grok-4.5-xhigh');
+    const grokXhigh = resolveModel('xai-grok/grok-4.6-xhigh');
     expect(grokXhigh).toBeUndefined();
 
     const gptOssHigh = resolveModel('google-antigravity/gpt-oss-120b-medium-high');
@@ -69,27 +69,27 @@ describe('models registry', () => {
   });
 
   it('computes backendModelId correctly for agy vs others', () => {
-    const gemini = resolveModel('google-antigravity/gemini-3.6-flash');
+    const gemini = resolveModel('google-antigravity/gemini-3.7-flash');
     if (!gemini) throw new Error('gemini resolution failed');
-    expect(backendModelId(gemini)).toBe('gemini-3.6-flash-high');
+    expect(backendModelId(gemini)).toBe('gemini-3.7-flash-high');
 
-    const geminiLow = resolveModel('google-antigravity/gemini-3.6-flash-low');
+    const geminiLow = resolveModel('google-antigravity/gemini-3.7-flash-low');
     if (!geminiLow) throw new Error('geminiLow resolution failed');
-    expect(backendModelId(geminiLow)).toBe('gemini-3.6-flash-low');
+    expect(backendModelId(geminiLow)).toBe('gemini-3.7-flash-low');
 
-    const grok = resolveModel('xai-grok/grok-4.5');
+    const grok = resolveModel('xai-grok/grok-4.6');
     if (!grok) throw new Error('grok resolution failed');
-    expect(backendModelId(grok)).toBe('grok-4.5');
+    expect(backendModelId(grok)).toBe('grok-4.6');
 
     const sonnet = resolveModel('anthropic-claude/sonnet-5');
     if (!sonnet) throw new Error('sonnet resolution failed');
     expect(backendModelId(sonnet)).toBe('claude-sonnet-5');
   });
 
-  it('marks codex, grok, and gemini-3.6-flash seats as image-gen capable', () => {
+  it('marks codex, grok, and gemini-3.7-flash seats as image-gen capable', () => {
     const codex = resolveModel('openai-codex/gpt-5.6-sol');
-    const grok = resolveModel('xai-grok/grok-4.5');
-    const gemini = resolveModel('google-antigravity/gemini-3.6-flash');
+    const grok = resolveModel('xai-grok/grok-4.6');
+    const gemini = resolveModel('google-antigravity/gemini-3.7-flash');
     const claudeSonnet = resolveModel('anthropic-claude/sonnet-5');
     if (!codex || !grok || !gemini || !claudeSonnet) throw new Error('resolution failed');
     expect(supportsImageGen(codex)).toBe(true);
@@ -100,9 +100,9 @@ describe('models registry', () => {
 
   it('lists only image-capable seats when imageOnly', () => {
     const lines = listModelHelpLines({ imageOnly: true }).join('\n');
-    expect(lines).toContain('xai-grok/grok-4.5');
+    expect(lines).toContain('xai-grok/grok-4.6');
     expect(lines).toContain('openai-codex/gpt-5.6-sol');
-    expect(lines).toContain('google-antigravity/gemini-3.6-flash');
+    expect(lines).toContain('google-antigravity/gemini-3.7-flash');
     expect(lines).not.toContain('anthropic-claude/sonnet-5');
   });
 
@@ -112,9 +112,9 @@ describe('models registry', () => {
     const err = formatImageGenModelError('anthropic-claude/sonnet-5', claudeSonnet);
     expect(err).toContain('cannot generate images');
     expect(err).toContain('backend "claude"');
-    expect(err).toContain('xai-grok/grok-4.5');
+    expect(err).toContain('xai-grok/grok-4.6');
     expect(err).toContain('openai-codex/gpt-5.6-sol');
-    expect(err).toContain('google-antigravity/gemini-3.6-flash');
+    expect(err).toContain('google-antigravity/gemini-3.7-flash');
     const seatsSection = err.slice(err.indexOf('Image-gen seats'));
     expect(seatsSection).not.toContain('anthropic-claude/sonnet-5');
   });

package/src/models.ts

@@ -4,7 +4,7 @@
  * Models are registered by canonical, provider-qualified slug —
  * `<vendor>-<cli>/<model>[-<effort>]`, e.g. `openai-codex/gpt-5.6-sol-high`.
  * Canonical slugs only — no short aliases, by design. That holds on both sides:
- * `backendModel` is a pinned model id (`claude-opus-5`), never a moving vendor
+ * `backendModel` is a pinned model id (`claude-sonnet-5`), never a moving vendor
  * alias (`opus`), so a seat never silently changes model under you.
  */
 
@@ -26,13 +26,33 @@ export interface ResolvedModel {
 }
 
 export const MODELS: Record<string, ModelSpec> = {
+  'xai-grok/grok-4.6': {
+    slug: 'xai-grok/grok-4.6',
+    backend: 'grok',
+    backendModel: 'grok-4.6',
+    efforts: ['low', 'medium', 'high'],
+    brief: 'xAI Grok 4.6 via grok CLI — own xAI login; ~30 req/min, ~1k msgs/day, single-flight',
+  },
+  // Both grok tiers stay registered: 4.6 and 4.5 differ in character, not just
+  // recency, so this is two seats of one class rather than a superseded pin.
   'xai-grok/grok-4.5': {
     slug: 'xai-grok/grok-4.5',
     backend: 'grok',
     backendModel: 'grok-4.5',
     efforts: ['low', 'medium', 'high'],
-    brief: 'xAI Grok 4.5 via grok CLI — default for plan & review; own xAI login',
+    brief: 'xAI Grok 4.5 via grok CLI — own xAI login; ~30 req/min, ~1k msgs/day, single-flight',
   },
+  'google-antigravity/gemini-3.7-flash': {
+    slug: 'google-antigravity/gemini-3.7-flash',
+    backend: 'agy',
+    backendModel: 'gemini-3.7-flash',
+    efforts: ['low', 'medium', 'high'],
+    defaultEffort: 'high',
+    brief:
+      'Google Gemini 3.7 Flash via agy — own Antigravity login; quota shared across all Gemini tiers (not yet itemised per-model, so no exhaustion preflight)',
+  },
+  // 3.6 stays registered while agy's quota endpoint still stops at 3.6: it is
+  // the newest flash tier the exhaustion preflight can actually guard.
   'google-antigravity/gemini-3.6-flash': {
     slug: 'google-antigravity/gemini-3.6-flash',
     backend: 'agy',
@@ -40,7 +60,17 @@ export const MODELS: Record<string, ModelSpec> = {
     efforts: ['low', 'medium', 'high'],
     defaultEffort: 'high',
     brief:
-      'Google Gemini 3.6 Flash via agy — default for implement, also image-gen; own Antigravity login',
+      'Google Gemini 3.6 Flash via agy — own Antigravity login; quota shared across all Gemini tiers',
+  },
+  'google-antigravity/gemini-3.1-pro': {
+    slug: 'google-antigravity/gemini-3.1-pro',
+    backend: 'agy',
+    // agy exposes only -high and -low for this class — there is no medium tier.
+    efforts: ['low', 'high'],
+    backendModel: 'gemini-3.1-pro',
+    defaultEffort: 'high',
+    brief:
+      'Google Gemini 3.1 Pro via agy — own Antigravity login; quota shared across all Gemini tiers',
   },
   'google-antigravity/claude-sonnet-4-6': {
     slug: 'google-antigravity/claude-sonnet-4-6',
@@ -68,30 +98,53 @@ export const MODELS: Record<string, ModelSpec> = {
     backend: 'codex',
     backendModel: 'gpt-5.6-sol',
     efforts: ['low', 'medium', 'high', 'xhigh'],
-    brief: 'OpenAI Codex gpt-5.6-sol via codex CLI',
+    brief: 'OpenAI gpt-5.6-sol via codex CLI — frontier agentic coding; own ChatGPT login',
   },
-  'anthropic-claude/sonnet-5': {
-    slug: 'anthropic-claude/sonnet-5',
+  'openai-codex/gpt-5.6-terra': {
+    slug: 'openai-codex/gpt-5.6-terra',
+    backend: 'codex',
+    backendModel: 'gpt-5.6-terra',
+    efforts: ['low', 'medium', 'high', 'xhigh'],
+    brief: 'OpenAI gpt-5.6-terra via codex CLI — balanced, everyday coding; own ChatGPT login',
+  },
+  'openai-codex/gpt-5.6-luna': {
+    slug: 'openai-codex/gpt-5.6-luna',
+    backend: 'codex',
+    backendModel: 'gpt-5.6-luna',
+    efforts: ['low', 'medium', 'high', 'xhigh'],
+    brief: 'OpenAI gpt-5.6-luna via codex CLI — fast and affordable coding; own ChatGPT login',
+  },
+  'anthropic-claude/fable-5': {
+    slug: 'anthropic-claude/fable-5',
     backend: 'claude',
-    backendModel: 'claude-sonnet-5',
+    backendModel: 'claude-fable-5',
     efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
-    brief: 'Claude Sonnet 5 via claude CLI — bills your Claude subscription',
+    defaultEffort: 'high',
+    brief:
+      'Claude Fable 5 via claude CLI — hardest, longest-running work; bills the claude CLI subscription',
   },
   'anthropic-claude/opus-5': {
     slug: 'anthropic-claude/opus-5',
     backend: 'claude',
-    backendModel: 'claude-opus-5',
+    backendModel: 'claude-opus-5[1m]',
     efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
     defaultEffort: 'high',
-    brief: 'Claude Opus 5 via claude CLI (default effort: high) — bills subscription',
+    brief:
+      'Claude Opus 5, 1M context via claude CLI — everyday complex work; bills the claude CLI subscription',
   },
-  'anthropic-claude/opus-5-1m': {
-    slug: 'anthropic-claude/opus-5-1m',
+  'anthropic-claude/sonnet-5': {
+    slug: 'anthropic-claude/sonnet-5',
     backend: 'claude',
-    backendModel: 'claude-opus-5[1m]',
+    backendModel: 'claude-sonnet-5',
     efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
-    defaultEffort: 'high',
-    brief: 'Claude Opus 5, 1M context via claude CLI — long-context work; bills subscription',
+    brief: 'Claude Sonnet 5 via claude CLI — routine work; bills the claude CLI subscription',
+  },
+  'anthropic-claude/haiku-4-5': {
+    slug: 'anthropic-claude/haiku-4-5',
+    backend: 'claude',
+    backendModel: 'claude-haiku-4-5-20251001',
+    efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
+    brief: 'Claude Haiku 4.5 via claude CLI — quick answers; bills the claude CLI subscription',
   },
 } as const satisfies Record<string, ModelSpec>;