@aibridge/cli 0.1.1 → 0.3.0

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', 'do something']);
+    await runCli(ctx, ['plan', '--model', 'xai-grok/grok-4.5', '--out', 'plan.md', 'do something']);
     expect(mockPlanImpl).toHaveBeenCalledTimes(1);
     const [call] = mockPlanImpl.mock.calls;
     expect(call).toBeDefined();
@@ -43,6 +43,8 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('do something');
     expect(flags).toEqual({
+      model: 'xai-grok/grok-4.5',
+      out: 'plan.md',
       preflight: true,
     });
   });
@@ -50,7 +52,17 @@ describe('flag mapping & defaults lock', () => {
   it('plan command handles --no-preflight and --timeout', async () => {
     mockPlanImpl.mockReset();
     const ctx = fakeCtx();
-    await runCli(ctx, ['plan', '--no-preflight', '--timeout', '120', 'task']);
+    await runCli(ctx, [
+      'plan',
+      '--model',
+      'xai-grok/grok-4.5',
+      '--out',
+      'plan.md',
+      '--no-preflight',
+      '--timeout',
+      '120',
+      'task',
+    ]);
     expect(mockPlanImpl).toHaveBeenCalledTimes(1);
     const [call] = mockPlanImpl.mock.calls;
     expect(call).toBeDefined();
@@ -58,6 +70,8 @@ describe('flag mapping & defaults lock', () => {
     const [flags, prompt] = call;
     expect(prompt).toBe('task');
     expect(flags).toEqual({
+      model: 'xai-grok/grok-4.5',
+      out: 'plan.md',
       preflight: false,
       timeout: 120,
     });
@@ -66,7 +80,7 @@ describe('flag mapping & defaults lock', () => {
   it('subagent command maps defaults correctly', async () => {
     mockSubagentImpl.mockReset();
     const ctx = fakeCtx();
-    await runCli(ctx, ['subagent', 'hello agent']);
+    await runCli(ctx, ['subagent', '--model', 'xai-grok/grok-4.5', 'hello agent']);
     expect(mockSubagentImpl).toHaveBeenCalledTimes(1);
     const [call] = mockSubagentImpl.mock.calls;
     expect(call).toBeDefined();
@@ -74,6 +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',
       tools: true,
       preflight: true,
       json: false,
@@ -83,7 +98,14 @@ describe('flag mapping & defaults lock', () => {
   it('subagent command handles --no-tools and --no-preflight', async () => {
     mockSubagentImpl.mockReset();
     const ctx = fakeCtx();
-    await runCli(ctx, ['subagent', '--no-tools', '--no-preflight', 'hello agent']);
+    await runCli(ctx, [
+      'subagent',
+      '--model',
+      'xai-grok/grok-4.5',
+      '--no-tools',
+      '--no-preflight',
+      'hello agent',
+    ]);
     expect(mockSubagentImpl).toHaveBeenCalledTimes(1);
     const [call] = mockSubagentImpl.mock.calls;
     expect(call).toBeDefined();
@@ -91,6 +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',
       tools: false,
       preflight: false,
       json: false,

package/src/index.ts

@@ -6,9 +6,6 @@ export { getDriver } from './drivers.ts';
 export {
   type Backend,
   backendModelId,
-  DEFAULT_IMAGE_GEN,
-  DEFAULT_IMPLEMENTER,
-  DEFAULT_MODEL,
   type Effort,
   formatImageGenModelError,
   formatUnknownModelError,

package/src/models.test.ts

@@ -22,7 +22,17 @@ describe('models registry', () => {
   });
 
   it('rejects short aliases — canonical slugs only', () => {
-    for (const alias of ['grok', 'gemini', 'codex', 'sonnet', 'opus', 'gemini-3.6', 'gpt-oss']) {
+    for (const alias of [
+      'grok',
+      'gemini',
+      'codex',
+      'sonnet',
+      'opus',
+      'gemini-3.6',
+      'gpt-oss',
+      'anthropic-claude/sonnet',
+      'anthropic-claude/opus',
+    ]) {
       expect(resolveModel(alias)).toBeUndefined();
     }
   });
@@ -32,8 +42,8 @@ describe('models registry', () => {
     expect(grokMedium?.spec.slug).toBe('xai-grok/grok-4.5');
     expect(grokMedium?.effort).toBe('medium');
 
-    const sonnetMax = resolveModel('anthropic-claude/sonnet-max');
-    expect(sonnetMax?.spec.slug).toBe('anthropic-claude/sonnet');
+    const sonnetMax = resolveModel('anthropic-claude/sonnet-5-max');
+    expect(sonnetMax?.spec.slug).toBe('anthropic-claude/sonnet-5');
     expect(sonnetMax?.effort).toBe('max');
   });
 
@@ -71,37 +81,41 @@ describe('models registry', () => {
     if (!grok) throw new Error('grok resolution failed');
     expect(backendModelId(grok)).toBe('grok-4.5');
 
-    const sonnet = resolveModel('anthropic-claude/sonnet');
+    const sonnet = resolveModel('anthropic-claude/sonnet-5');
     if (!sonnet) throw new Error('sonnet resolution failed');
-    expect(backendModelId(sonnet)).toBe('sonnet');
+    expect(backendModelId(sonnet)).toBe('claude-sonnet-5');
   });
 
-  it('marks only codex and grok seats as image-gen capable', () => {
+  it('marks codex, grok, and gemini-3.6-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');
-    if (!codex || !grok || !gemini) throw new Error('resolution failed');
+    const claudeSonnet = resolveModel('anthropic-claude/sonnet-5');
+    if (!codex || !grok || !gemini || !claudeSonnet) throw new Error('resolution failed');
     expect(supportsImageGen(codex)).toBe(true);
     expect(supportsImageGen(grok)).toBe(true);
-    expect(supportsImageGen(gemini)).toBe(false);
+    expect(supportsImageGen(gemini)).toBe(true);
+    expect(supportsImageGen(claudeSonnet)).toBe(false);
   });
 
   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('openai-codex/gpt-5.6-sol');
-    expect(lines).not.toContain('google-antigravity/gemini-3.6-flash');
+    expect(lines).toContain('google-antigravity/gemini-3.6-flash');
+    expect(lines).not.toContain('anthropic-claude/sonnet-5');
   });
 
   it('formats image-gen model errors with capable seats only', () => {
-    const gemini = resolveModel('google-antigravity/gemini-3.6-flash');
-    if (!gemini) throw new Error('gemini resolution failed');
-    const err = formatImageGenModelError('google-antigravity/gemini-3.6-flash', gemini);
+    const claudeSonnet = resolveModel('anthropic-claude/sonnet-5');
+    if (!claudeSonnet) throw new Error('claudeSonnet resolution failed');
+    const err = formatImageGenModelError('anthropic-claude/sonnet-5', claudeSonnet);
     expect(err).toContain('cannot generate images');
-    expect(err).toContain('backend "agy"');
+    expect(err).toContain('backend "claude"');
     expect(err).toContain('xai-grok/grok-4.5');
     expect(err).toContain('openai-codex/gpt-5.6-sol');
+    expect(err).toContain('google-antigravity/gemini-3.6-flash');
     const seatsSection = err.slice(err.indexOf('Image-gen seats'));
-    expect(seatsSection).not.toContain('google-antigravity/gemini-3.6-flash');
+    expect(seatsSection).not.toContain('anthropic-claude/sonnet-5');
   });
 });

package/src/models.ts

@@ -3,7 +3,9 @@
  *
  * 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.
+ * 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
+ * alias (`opus`), so a seat never silently changes model under you.
  */
 
 export type Backend = 'agy' | 'claude' | 'codex' | 'grok';
@@ -12,7 +14,7 @@ export type Effort = 'low' | 'medium' | 'high' | 'xhigh' | 'max';
 export interface ModelSpec {
   readonly slug: string; // canonical, effort-less
   readonly backend: Backend;
-  readonly backendModel: string | undefined; // undefined = CLI default
+  readonly backendModel: string; // always explicit — never "whatever the CLI defaults to"
   readonly efforts: readonly Effort[] | null;
   readonly defaultEffort?: Effort; // only when backend REQUIRES one (agy gemini)
   readonly brief: string;
@@ -37,7 +39,8 @@ export const MODELS: Record<string, ModelSpec> = {
     backendModel: 'gemini-3.6-flash',
     efforts: ['low', 'medium', 'high'],
     defaultEffort: 'high',
-    brief: 'Google Gemini 3.6 Flash via agy — default for implement; own Antigravity login',
+    brief:
+      'Google Gemini 3.6 Flash via agy — default for implement, also image-gen; own Antigravity login',
   },
   'google-antigravity/claude-sonnet-4-6': {
     slug: 'google-antigravity/claude-sonnet-4-6',
@@ -67,31 +70,45 @@ export const MODELS: Record<string, ModelSpec> = {
     efforts: ['low', 'medium', 'high', 'xhigh'],
     brief: 'OpenAI Codex gpt-5.6-sol via codex CLI',
   },
-  'anthropic-claude/sonnet': {
-    slug: 'anthropic-claude/sonnet',
+  'anthropic-claude/sonnet-5': {
+    slug: 'anthropic-claude/sonnet-5',
     backend: 'claude',
-    backendModel: 'sonnet',
+    backendModel: 'claude-sonnet-5',
     efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
-    brief: 'Claude Sonnet via claude CLI — bills your Claude subscription',
+    brief: 'Claude Sonnet 5 via claude CLI — bills your Claude subscription',
   },
-  'anthropic-claude/opus': {
-    slug: 'anthropic-claude/opus',
+  'anthropic-claude/opus-5': {
+    slug: 'anthropic-claude/opus-5',
     backend: 'claude',
-    backendModel: 'opus',
+    backendModel: 'claude-opus-5',
     efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
     defaultEffort: 'high',
-    brief: 'Claude Opus via claude CLI (default effort: high) — bills subscription',
+    brief: 'Claude Opus 5 via claude CLI (default effort: high) — bills subscription',
+  },
+  'anthropic-claude/opus-5-1m': {
+    slug: 'anthropic-claude/opus-5-1m',
+    backend: 'claude',
+    backendModel: 'claude-opus-5[1m]',
+    efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
+    defaultEffort: 'high',
+    brief: 'Claude Opus 5, 1M context via claude CLI — long-context work; bills subscription',
   },
 } as const satisfies Record<string, ModelSpec>;
 
-export const DEFAULT_MODEL = 'xai-grok/grok-4.5';
-export const DEFAULT_IMPLEMENTER = 'google-antigravity/gemini-3.6-flash';
-export const DEFAULT_IMAGE_GEN = 'openai-codex/gpt-5.6-sol';
+export type ImageFormat = 'jpg' | 'png';
 
-const IMAGE_GEN_BACKENDS: ReadonlySet<Backend> = new Set(['codex', 'grok']);
+const IMAGE_GEN_FORMATS: ReadonlyMap<Backend, ImageFormat> = new Map([
+  ['agy', 'jpg'],
+  ['codex', 'png'],
+  ['grok', 'jpg'],
+]);
 
 export function supportsImageGen(resolved: ResolvedModel): boolean {
-  return IMAGE_GEN_BACKENDS.has(resolved.spec.backend);
+  return IMAGE_GEN_FORMATS.has(resolved.spec.backend);
+}
+
+export function imageFormatFor(resolved: ResolvedModel): ImageFormat | undefined {
+  return IMAGE_GEN_FORMATS.get(resolved.spec.backend);
 }
 
 const EFFORTS_SET: ReadonlySet<string> = new Set<Effort>(['low', 'medium', 'high', 'xhigh', 'max']);
@@ -122,10 +139,7 @@ export function resolveModel(input: string): ResolvedModel | undefined {
   return undefined;
 }
 
-export function backendModelId(resolved: ResolvedModel): string | undefined {
-  if (!resolved.spec.backendModel) {
-    return undefined;
-  }
+export function backendModelId(resolved: ResolvedModel): string {
   if (resolved.spec.backend === 'agy') {
     const effort = resolved.effort ?? resolved.spec.defaultEffort;
     if (effort) {
@@ -138,7 +152,7 @@ export function backendModelId(resolved: ResolvedModel): string | undefined {
 export function listModelHelpLines(opts: { readonly imageOnly?: boolean } = {}): string[] {
   const lines: string[] = [];
   for (const [slug, spec] of Object.entries(MODELS)) {
-    if (opts.imageOnly && !IMAGE_GEN_BACKENDS.has(spec.backend)) continue;
+    if (opts.imageOnly && !IMAGE_GEN_FORMATS.has(spec.backend)) continue;
     lines.push(`  ${slug}`);
     lines.push(`    ${spec.brief}`);
   }

package/src/quotaPreflight.ts

@@ -62,8 +62,7 @@ export async function preflightModel(resolved: ResolvedModel): Promise<Preflight
 
   try {
     const snapshot = await fetchAgyQuota();
-    const modelId = backendModelId(resolved) ?? '';
-    return evaluateAgyPreflight(snapshot, modelId);
+    return evaluateAgyPreflight(snapshot, backendModelId(resolved));
   } catch (err) {
     return {
       ok: true,