@aibridge/cli 0.1.1 → 0.2.0

package/README.md

@@ -15,7 +15,7 @@
 
 ---
 
-Your agent is one model, from one provider. Your machine probably has several more sitting behind CLIs you already use — `grok`, `agy` (Antigravity), `codex`, `claude`. **aibridge** turns them into seats your agent can drive: a planner that studies your repo, an implementer that edits it and runs your real tests, a reviewer from a *different* model family that cross-checks the diff against the plan, concurrent one-shot delegates — and capabilities your agent's own provider may not offer at all, like real image generation (gpt-image-2, Grok Imagine).
+Your agent is one model, from one provider. Your machine probably has several more sitting behind CLIs you already use — `grok`, `agy` (Antigravity), `codex`, `claude`. **aibridge** turns them into seats your agent can drive: a planner that studies your repo, an implementer that edits it and runs your real tests, a reviewer from a *different* model family that cross-checks the diff against the plan, concurrent one-shot delegates — and capabilities your agent's own provider may not offer at all, like real image generation (Codex, Antigravity, or Grok seats).
 
 ## Install
 
@@ -41,7 +41,7 @@ npx -y @aibridge/cli subagent "summarize the architecture of this repo"
 | `aibridge implement <plan.md>` | You have an approved plan file and want it executed in place — with your project's **real typecheck and tests** run until green |
 | `aibridge review [--plan <plan.md>]` | You want a **different model** to pressure-test the working-tree diff against the plan contract (over-reach is a finding) — or to review the plan itself before implementing |
 | `aibridge subagent "<task>"` | A self-contained task deserves a concurrent delegate, a cross-model second opinion, or a red-team pass |
-| `aibridge image-gen "<prompt>"` | You need a real raster image — gpt-image-2 (default) or Grok Imagine, with render verification |
+| `aibridge image-gen "<prompt>" --out out.png` | You need a real raster image — on a Codex (default), Antigravity, or Grok seat, with render verification |
 | `aibridge quota` | Two-second check of every backend's remaining quota before you pipeline work |
 | `aibridge runs` | Inspect or watch past delegation runs (`~/.aibridge/runs`) |
 
@@ -61,7 +61,7 @@ Plan files — not their contents — travel between stages, so the loop is near
 - **The skill carries judgment; the CLI owns execution.** The skill teaches your agent prompt-craft, seat selection, and when to gate; the CLI deterministically drives the backing CLIs, captures their output, verifies results (a "generated image" under 100 KB is a code-drawn fake, an empty answer is a quota death), and logs every run.
 - **Seats stay cross-model by default.** Grok plans and reviews, Gemini implements — a model never reviews its own diff, and independent eyes catch what shared blind spots miss.
 - **No API keys.** Delegation runs on the backing CLIs' existing logins, each spending its own quota. (The skill treats a backend that shares your agent's own quota pool as a last resort.)
-- **Models are canonical slugs**: `<vendor>-<cli>/<model>[-<effort>]` — e.g. `xai-grok/grok-4.5`, `google-antigravity/gemini-3.6-flash`, `openai-codex/gpt-5.6-sol-high`, `anthropic-claude/opus`. No aliases; `aibridge <command> --help` lists every seat.
+- **Models are canonical slugs**: `<vendor>-<cli>/<model>[-<effort>]` — e.g. `xai-grok/grok-4.5`, `google-antigravity/gemini-3.6-flash`, `openai-codex/gpt-5.6-sol-high`, `anthropic-claude/opus-5`. No aliases — not short ones, and not moving vendor aliases like `opus`: every seat pins an exact model version. `aibridge <command> --help` lists every seat.
 
 ## Requirements
 
@@ -72,6 +72,10 @@ Plan files — not their contents — travel between stages, so the loop is near
 
 Everything is published under the [`@aibridge`](https://www.npmjs.com/org/aibridge) scope: [`@aibridge/cli`](https://www.npmjs.com/package/@aibridge/cli) (the command), `@aibridge/proc` (spawn/capture), and one driver per backing CLI — `@aibridge/driver-agy`, `@aibridge/driver-grok`, `@aibridge/driver-codex`, `@aibridge/driver-claude` — reusable if you want to drive a single CLI from your own code.
 
+## Security
+
+aibridge executes real delegation — that's the product, and security scanners rightly notice: backing CLIs read/write files and run shell in tools mode, **at the same trust level as the agent you already run**. Nothing gains more access than you granted your agent and those CLIs when you installed them. Task content goes to the delegate's provider (use `--no-tools` for untrusted input — reasoning only, no file/shell access). All packages publish from this public repo via OIDC with [SLSA provenance](https://www.npmjs.com/package/@aibridge/cli), with no install-time scripts.
+
 ## Contributing & development
 
 Dev docs, architecture, and the working agreements for coding agents live in [`AGENTS.md`](AGENTS.md); design history in [`docs/`](docs/). Quick loop:

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as runCli, t as buildContext } from "./context-8JjDzZBG.mjs";
+import { r as runCli, t as buildContext } from "./context-DQxvMUd2.mjs";
 //#region src/cli.ts
 await runCli(buildContext(process), process.argv.slice(2));
 //#endregion

package/dist/{context-8JjDzZBG.mjs → context-DQxvMUd2.mjs}

@@ -3,7 +3,6 @@ import { ExitCode, buildApplication, buildCommand, buildRouteMap, run } from "@s
 import { appendFileSync, closeSync, copyFileSync, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
-import { isNotFound, runCaptured } from "@aibridge/proc";
 import * as agy from "@aibridge/driver-agy";
 import { fetchAgyQuota, findModelQuota } from "@aibridge/driver-agy";
 import * as claude from "@aibridge/driver-claude";
@@ -11,6 +10,7 @@ import { fetchClaudeQuota } from "@aibridge/driver-claude";
 import * as codex from "@aibridge/driver-codex";
 import { fetchCodexQuota } from "@aibridge/driver-codex";
 import * as grok from "@aibridge/driver-grok";
+import { runCaptured } from "@aibridge/proc";
 import { randomBytes } from "node:crypto";
 //#region src/models.ts
 const MODELS = {
@@ -35,7 +35,7 @@ const MODELS = {
 			"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",
@@ -70,10 +70,10 @@ const MODELS = {
 		],
 		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",
@@ -81,12 +81,12 @@ const MODELS = {
 			"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",
@@ -95,15 +95,36 @@ const MODELS = {
 			"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"
 	}
 };
 const DEFAULT_MODEL = "xai-grok/grok-4.5";
 const DEFAULT_IMPLEMENTER = "google-antigravity/gemini-3.6-flash";
 const DEFAULT_IMAGE_GEN = "openai-codex/gpt-5.6-sol";
-const IMAGE_GEN_BACKENDS = /* @__PURE__ */ new Set(["codex", "grok"]);
+const IMAGE_GEN_FORMATS = /* @__PURE__ */ new Map([
+	["agy", "jpg"],
+	["codex", "png"],
+	["grok", "jpg"]
+]);
 function supportsImageGen(resolved) {
-	return IMAGE_GEN_BACKENDS.has(resolved.spec.backend);
+	return IMAGE_GEN_FORMATS.has(resolved.spec.backend);
+}
+function imageFormatFor(resolved) {
+	return IMAGE_GEN_FORMATS.get(resolved.spec.backend);
 }
 const EFFORTS_SET = /* @__PURE__ */ new Set([
 	"low",
@@ -132,7 +153,6 @@ function resolveModel(input) {
 	}
 }
 function backendModelId(resolved) {
-	if (!resolved.spec.backendModel) return;
 	if (resolved.spec.backend === "agy") {
 		const effort = resolved.effort ?? resolved.spec.defaultEffort;
 		if (effort) return `${resolved.spec.backendModel}-${effort}`;
@@ -142,7 +162,7 @@ function backendModelId(resolved) {
 function listModelHelpLines(opts = {}) {
 	const lines = [];
 	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}`);
 	}
@@ -186,7 +206,8 @@ const DRIVERS = {
 	agy: {
 		probe: () => agy.probe(),
 		run: (task) => agy.run(task),
-		quota: () => agy.fetchAgyQuota()
+		quota: () => agy.fetchAgyQuota(),
+		generateImage: (req) => agy.generateImage(req)
 	},
 	grok: {
 		probe: () => grok.probe(),
@@ -213,7 +234,7 @@ function getDriver(backend) {
 //#endregion
 //#region src/commands/image-gen/impl.ts
 const MIN_REAL_BYTES_CODEX = 1e5;
-const MIN_REAL_BYTES_GROK = 1e4;
+const MIN_REAL_BYTES_TOOL = 1e4;
 async function imageGen$1(flags, prompt) {
 	const fail = (msg) => {
 		this.process.stderr.write(`aibridge image-gen: ${msg}\n`);
@@ -223,28 +244,19 @@ async function imageGen$1(flags, prompt) {
 	const model = resolveModel(inputSlug);
 	if (!model) return fail(formatUnknownModelError(inputSlug));
 	if (!supportsImageGen(model)) return fail(formatImageGenModelError(inputSlug, model));
-	if (model.spec.backend === "codex" && model.effort) return fail(`effort "-${model.effort}" has no effect on image-gen (gpt-image-2 renders, not the seat model); use ${DEFAULT_IMAGE_GEN}.`);
-	const quality = (flags.quality ?? "high").toLowerCase();
-	if (![
-		"low",
-		"medium",
-		"high"
-	].includes(quality)) return fail(`invalid --quality "${flags.quality}" (use low | medium | high)`);
-	let size;
-	if (flags.size !== void 0) {
-		const m = flags.size.match(/^(\d+)\s*x\s*(\d+)$/i);
-		if (!m) return fail(`invalid --size "${flags.size}" (expected e.g. 1024x1024)`);
-		size = {
-			w: Number(m[1]),
-			h: Number(m[2])
-		};
-		if (model.spec.backend === "codex") {
-			const constraint = sizeConstraintError(size.w, size.h);
-			if (constraint) return fail(`invalid --size ${size.w}x${size.h}: ${constraint}`);
-		} else if (size.w < 1 || size.h < 1) return fail(`invalid --size ${size.w}x${size.h}: dimensions must be positive`);
+	if (model.spec.backend === "codex" && model.effort) return fail(`effort "-${model.effort}" has no effect on image-gen (the image tool renders, not the seat model); use ${DEFAULT_IMAGE_GEN}.`);
+	const expected = imageFormatFor(model);
+	if (expected === void 0) return fail(formatImageGenModelError(inputSlug, model));
+	const label = expected === "png" ? "PNG" : "JPEG";
+	if (!(expected === "png" ? /\.png$/i.test(flags.out) : /\.jpe?g$/i.test(flags.out))) return fail(`--out "${flags.out}" must end in ${expected === "png" ? ".png" : ".jpg or .jpeg"} — the ${model.spec.slug} seat renders ${label} and aibridge does not convert.`);
+	let aspectRatio;
+	if (flags.aspectRatio !== void 0) {
+		const m = flags.aspectRatio.match(/^(\d+)\s*:\s*(\d+)$/);
+		if (!m || Number(m[1]) < 1 || Number(m[2]) < 1) return fail(`invalid --aspect-ratio "${flags.aspectRatio}" (expected e.g. 16:9)`);
+		aspectRatio = `${Number(m[1])}:${Number(m[2])}`;
 	}
 	const timeoutSec = flags.timeout ?? 600;
-	const outPath = resolve(this.process.cwd(), flags.out ?? "./aibridge-image.png");
+	const outPath = resolve(this.process.cwd(), flags.out);
 	const imagePaths = [];
 	if (flags.image !== void 0) for (const raw of flags.image.split(",").map((s) => s.trim()).filter(Boolean)) {
 		const abs = resolve(this.process.cwd(), raw);
@@ -253,16 +265,15 @@ async function imageGen$1(flags, prompt) {
 	}
 	const driver = getDriver(model.spec.backend);
 	if (!driver.generateImage) return fail(formatImageGenModelError(inputSlug, model));
-	const minBytes = model.spec.backend === "codex" ? MIN_REAL_BYTES_CODEX : MIN_REAL_BYTES_GROK;
+	const minBytes = model.spec.backend === "codex" ? MIN_REAL_BYTES_CODEX : MIN_REAL_BYTES_TOOL;
 	const work = mkdtempSync(join(tmpdir(), "aibridge-imagegen-"));
 	try {
 		let outcome = await driver.generateImage({
 			prompt,
 			workDir: work,
-			backendModel: model.spec.backendModel,
+			backendModel: backendModelId(model),
 			effort: model.effort,
-			quality,
-			size,
+			aspectRatio,
 			imagePaths,
 			timeoutSec,
 			forceful: false,
@@ -271,10 +282,9 @@ async function imageGen$1(flags, prompt) {
 		if (model.spec.backend === "codex" && outcome.kind === "suspect") outcome = await driver.generateImage({
 			prompt,
 			workDir: work,
-			backendModel: model.spec.backendModel,
+			backendModel: backendModelId(model),
 			effort: model.effort,
-			quality,
-			size,
+			aspectRatio,
 			imagePaths,
 			timeoutSec,
 			forceful: true,
@@ -282,34 +292,20 @@ async function imageGen$1(flags, prompt) {
 		});
 		if (outcome.kind === "ok" && outcome.bytes < minBytes) outcome = { kind: "suspect" };
 		if (outcome.kind === "error") return fail(outcome.reason);
-		if (outcome.kind === "suspect") return fail(model.spec.backend === "grok" ? "grok produced no usable image. Check SuperGrok image access and re-run with a simpler prompt." : "codex produced only a tiny/code-drawn image, not a real gpt-image-2 render. Try --quality high or a clearer, simpler prompt.");
+		if (outcome.kind === "suspect") return fail(model.spec.backend === "agy" ? "agy produced no usable image. Re-run with a simpler prompt, or check Antigravity image access." : model.spec.backend === "grok" ? "grok produced no usable image. Check SuperGrok image access and re-run with a simpler prompt." : "codex produced only a tiny/code-drawn image, not a real render. Try a clearer, simpler prompt.");
 		const local = join(work, "result.bin");
 		copyFileSync(outcome.path, local);
-		let dims = imageSize(local);
-		if (size && dims && (dims.width !== size.w || dims.height !== size.h)) if (await magick([
-			local,
-			"-resize",
-			`${size.w}x${size.h}!`,
-			local
-		])) dims = imageSize(local) ?? dims;
-		else this.process.stderr.write(`aibridge image-gen: rendered ${dims.width}x${dims.height}, wanted ${size.w}x${size.h}, and ImageMagick (magick/convert) is unavailable to resize.
-`);
-		const outExt = /\.png$/i.test(outPath) ? "png" : /\.jpe?g$/i.test(outPath) ? "jpg" : null;
-		const actualFmt = pngSize(local) ? "png" : jpegSize(local) ? "jpg" : null;
-		const needsConvert = outExt !== null && actualFmt !== null && outExt !== actualFmt;
-		if (!needsConvert || !await magick([local, outPath])) {
-			if (needsConvert) this.process.stderr.write(`aibridge image-gen: render is ${actualFmt.toUpperCase()} but out path wants ${outExt.toUpperCase()}, and ImageMagick (magick/convert) is unavailable to convert; writing the raw bytes as-is.
-`);
-			copyFileSync(local, outPath);
-		}
+		const dims = imageSize(local);
+		const actual = pngSize(local) ? "png" : jpegSize(local) ? "jpg" : null;
+		if (actual !== null && actual !== expected) this.process.stderr.write(`aibridge image-gen: expected a ${label} render from this seat but got ${actual === "png" ? "PNG" : "JPEG"}; wrote the raw bytes to ${outPath} anyway — the extension does not match the contents.\n`);
+		copyFileSync(local, outPath);
 		const bytes = statSync(outPath).size;
 		if (flags.json) this.process.stdout.write(`${JSON.stringify({
 			out: outPath,
 			bytes,
 			width: dims?.width ?? null,
 			height: dims?.height ?? null,
-			sizeRequested: flags.size ?? null,
-			quality: model.spec.backend === "codex" ? quality : null,
+			aspectRatio: flags.aspectRatio ?? null,
 			model: model.spec.slug,
 			backend: model.spec.backend,
 			real: true
@@ -317,8 +313,7 @@ async function imageGen$1(flags, prompt) {
 		else {
 			const kb = Math.round(bytes / 1024);
 			const dimStr = dims ? `${dims.width}x${dims.height}, ` : "";
-			const qualityStr = model.spec.backend === "codex" ? `, ${quality} quality` : "";
-			this.process.stdout.write(`✓ Wrote ${outPath} (${dimStr}${kb} KB${qualityStr}, ${model.spec.slug})\n`);
+			this.process.stdout.write(`✓ Wrote ${outPath} (${dimStr}${kb} KB, ${model.spec.slug})\n`);
 		}
 	} finally {
 		rmSync(work, {
@@ -327,15 +322,6 @@ async function imageGen$1(flags, prompt) {
 		});
 	}
 }
-function sizeConstraintError(w, h) {
-	if (w % 16 !== 0 || h % 16 !== 0) return "each edge must be divisible by 16";
-	const long = Math.max(w, h);
-	if (long / Math.min(w, h) > 3) return "aspect ratio must be within 1:3–3:1";
-	if (long > 3840) return "longest edge must be <= 3840px";
-	const px = w * h;
-	if (px < 655360 || px > 8294400) return "total pixels must be 655,360–8,294,400";
-	return null;
-}
 function imageSize(path) {
 	return pngSize(path) ?? jpegSize(path);
 }
@@ -384,24 +370,15 @@ function jpegSize(path) {
 		return null;
 	}
 }
-async function magick(args) {
-	for (const tool of ["magick", "convert"]) try {
-		const r = await runCaptured(tool, [...args], { timeoutMs: 6e4 });
-		if (!r.timedOut && r.code === 0) return true;
-	} catch (err) {
-		if (!isNotFound(err)) throw err;
-	}
-	return false;
-}
 //#endregion
 //#region src/commands/image-gen/command.ts
 const fullDescription$6 = [
-	"Renders an image by driving the seat's CLI (codex → gpt-image-2, grok →",
-	"Imagine), then verifies the result is a real render before returning it.",
+	"Renders an image by driving the seat's own CLI, then verifies the result is",
+	"a real render before returning it.",
 	"",
 	"Image-gen seats (canonical slug):",
 	...listModelHelpLines({ imageOnly: true }),
-	`Default: ${DEFAULT_IMAGE_GEN} (gpt-image-2 via codex; historical default).`
+	`Default: ${DEFAULT_IMAGE_GEN}.`
 ].join("\n");
 const imageGen = buildCommand({
 	func: imageGen$1,
@@ -416,14 +393,13 @@ const imageGen = buildCommand({
 			out: {
 				kind: "parsed",
 				parse: String,
-				optional: true,
-				brief: "Path to write the image (default: ./aibridge-image.png)"
+				brief: "Path to write the image — extension must match the seat format (.png for codex, .jpg for agy/grok)"
 			},
-			size: {
+			aspectRatio: {
 				kind: "parsed",
 				parse: String,
 				optional: true,
-				brief: "WIDTHxHEIGHT (codex: each edge ÷16; grok: mapped to aspect_ratio, then optionally resized)"
+				brief: "Aspect ratio N:M, e.g. 16:9 (agy/grok: real tool param; codex: prompt hint)"
 			},
 			image: {
 				kind: "parsed",
@@ -431,12 +407,6 @@ const imageGen = buildCommand({
 				optional: true,
 				brief: "Reference image path(s), comma-separated — visual reference"
 			},
-			quality: {
-				kind: "parsed",
-				parse: String,
-				optional: true,
-				brief: "low | medium | high (codex/gpt-image-2; default high)"
-			},
 			timeout: {
 				kind: "parsed",
 				parse: positiveIntSeconds,
@@ -473,7 +443,7 @@ async function delegate(opts, driver = getDriver(opts.model.spec.backend)) {
 		tools: opts.tools,
 		timeoutSec: opts.timeoutSec,
 		cwd: opts.cwd,
-		backendModel: backendModelId(opts.model) ?? opts.model.spec.backendModel,
+		backendModel: backendModelId(opts.model),
 		effort: opts.model.effort,
 		onStdout: (c) => opts.run.stdout(c),
 		onStderr: (c) => opts.run.stderr(c),
@@ -526,7 +496,7 @@ async function preflightModel(resolved) {
 	if (resolved.spec.backend === "codex") return preflightCodex();
 	if (resolved.spec.backend !== "agy") return { ok: true };
 	try {
-		return evaluateAgyPreflight(await fetchAgyQuota(), backendModelId(resolved) ?? "");
+		return evaluateAgyPreflight(await fetchAgyQuota(), backendModelId(resolved));
 	} catch (err) {
 		return {
 			ok: true,
@@ -1414,15 +1384,13 @@ async function subagent$1(flags, prompt) {
 		this.process.exitCode = 1;
 		return;
 	}
-	if (flags.json) {
-		const modelId = backendModelId(model) ?? null;
-		this.process.stdout.write(`${JSON.stringify({
-			model: modelId,
-			slug: model.spec.slug,
-			response: outcome.response,
-			exitCode: outcome.exitCode
-		})}\n`);
-	} else this.process.stdout.write(`${outcome.response}\n`);
+	if (flags.json) this.process.stdout.write(`${JSON.stringify({
+		model: backendModelId(model),
+		slug: model.spec.slug,
+		response: outcome.response,
+		exitCode: outcome.exitCode
+	})}\n`);
+	else this.process.stdout.write(`${outcome.response}\n`);
 }
 //#endregion
 //#region src/commands/subagent/command.ts
@@ -1509,7 +1477,7 @@ const app = buildApplication(buildRouteMap({
 		runs,
 		quota
 	},
-	docs: { brief: "Bridge tasks to non-Claude AI CLIs — a plan → implement → review workflow, task delegation, and image generation (codex gpt-image-2 / grok Imagine)." }
+	docs: { brief: "Bridge tasks to non-Claude AI CLIs — a plan → implement → review workflow, task delegation, and image generation (codex / agy / grok seats)." }
 }), {
 	name: "aibridge",
 	versionInfo: { currentVersion: version },

package/dist/index.d.mts

@@ -20,14 +20,16 @@ declare function runCli(ctx: LocalContext, argv: readonly string[]): Promise<voi
  *
  * 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.
  */
 type Backend = 'agy' | 'claude' | 'codex' | 'grok';
 type Effort = 'low' | 'medium' | 'high' | 'xhigh' | 'max';
 interface ModelSpec {
   readonly slug: string;
   readonly backend: Backend;
-  readonly backendModel: string | undefined;
+  readonly backendModel: string;
   readonly efforts: readonly Effort[] | null;
   readonly defaultEffort?: Effort;
   readonly brief: string;
@@ -42,7 +44,7 @@ declare const DEFAULT_IMPLEMENTER = "google-antigravity/gemini-3.6-flash";
 declare const DEFAULT_IMAGE_GEN = "openai-codex/gpt-5.6-sol";
 declare function supportsImageGen(resolved: ResolvedModel): boolean;
 declare function resolveModel(input: string): ResolvedModel | undefined;
-declare function backendModelId(resolved: ResolvedModel): string | undefined;
+declare function backendModelId(resolved: ResolvedModel): string;
 declare function listModelHelpLines(opts?: {
   readonly imageOnly?: boolean;
 }): string[];
@@ -62,7 +64,7 @@ interface DelegationTask {
   readonly tools: boolean;
   readonly timeoutSec: number;
   readonly cwd: string;
-  readonly backendModel: string | undefined;
+  readonly backendModel: string;
   readonly effort: Effort | undefined;
   readonly onStdout?: (chunk: string) => void;
   readonly onStderr?: (chunk: string) => void;
@@ -82,13 +84,9 @@ type QuotaSnapshot = AgyQuotaSnapshot | CodexQuotaSnapshot | ClaudeQuotaSnapshot
 interface ImageGenRequest {
   readonly prompt: string;
   readonly workDir: string;
-  readonly backendModel: string | undefined;
+  readonly backendModel: string;
   readonly effort: Effort | undefined;
-  readonly quality: string;
-  readonly size: {
-    readonly w: number;
-    readonly h: number;
-  } | undefined;
+  readonly aspectRatio: string | undefined;
   readonly imagePaths: readonly string[];
   readonly timeoutSec: number;
   readonly forceful: boolean;

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { C as listModelHelpLines, S as formatUnknownModelError, T as supportsImageGen, _ as DEFAULT_IMPLEMENTER, a as readRunLogs, b as backendModelId, c as evaluateCodexPreflight, d as renderPreflightRefusal, f as delegate, g as DEFAULT_IMAGE_GEN, h as positiveIntSeconds, i as listRuns, l as preflightCodex, m as nonEmptyPrompt, n as app, o as startRun, p as getDriver, r as runCli, s as evaluateAgyPreflight, t as buildContext, u as preflightModel, v as DEFAULT_MODEL, w as resolveModel, x as formatImageGenModelError, y as MODELS } from "./context-8JjDzZBG.mjs";
+import { C as listModelHelpLines, S as formatUnknownModelError, T as supportsImageGen, _ as DEFAULT_IMPLEMENTER, a as readRunLogs, b as backendModelId, c as evaluateCodexPreflight, d as renderPreflightRefusal, f as delegate, g as DEFAULT_IMAGE_GEN, h as positiveIntSeconds, i as listRuns, l as preflightCodex, m as nonEmptyPrompt, n as app, o as startRun, p as getDriver, r as runCli, s as evaluateAgyPreflight, t as buildContext, u as preflightModel, v as DEFAULT_MODEL, w as resolveModel, x as formatImageGenModelError, y as MODELS } from "./context-DQxvMUd2.mjs";
 export { DEFAULT_IMAGE_GEN, DEFAULT_IMPLEMENTER, DEFAULT_MODEL, MODELS, app, backendModelId, buildContext, delegate, evaluateAgyPreflight, evaluateCodexPreflight, formatImageGenModelError, formatUnknownModelError, getDriver, listModelHelpLines, listRuns, nonEmptyPrompt, positiveIntSeconds, preflightCodex, preflightModel, readRunLogs, renderPreflightRefusal, resolveModel, runCli, startRun, supportsImageGen };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aibridge/cli",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "CLI that bridges tasks to AI CLIs on your machine (plan / implement / review / subagent / image-gen)",
   "type": "module",
   "license": "MIT",
@@ -35,11 +35,11 @@
   ],
   "dependencies": {
     "@stricli/core": "1.3.0",
-    "@aibridge/proc": "0.1.1",
-    "@aibridge/driver-agy": "0.1.1",
-    "@aibridge/driver-grok": "0.1.1",
-    "@aibridge/driver-codex": "0.1.1",
-    "@aibridge/driver-claude": "0.1.1"
+    "@aibridge/proc": "0.2.0",
+    "@aibridge/driver-codex": "0.2.0",
+    "@aibridge/driver-grok": "0.2.0",
+    "@aibridge/driver-claude": "0.2.0",
+    "@aibridge/driver-agy": "0.2.0"
   },
   "devDependencies": {
     "tsdown": "0.22.14"

package/src/app.ts

@@ -14,7 +14,7 @@ const require = createRequire(import.meta.url);
 const { version } = require('../package.json') as { version: string };
 
 const BRIEF =
-  'Bridge tasks to non-Claude AI CLIs — a plan → implement → review workflow, task delegation, and image generation (codex gpt-image-2 / grok Imagine).';
+  'Bridge tasks to non-Claude AI CLIs — a plan → implement → review workflow, task delegation, and image generation (codex / agy / grok seats).';
 
 const routes = buildRouteMap({
   routes: {

package/src/commands/image-gen/command.ts

@@ -4,12 +4,12 @@ import { nonEmptyPrompt, positiveIntSeconds } from '../../parsers.ts';
 import imageGenImpl from './impl.ts';
 
 const fullDescription = [
-  "Renders an image by driving the seat's CLI (codex → gpt-image-2, grok →",
-  'Imagine), then verifies the result is a real render before returning it.',
+  "Renders an image by driving the seat's own CLI, then verifies the result is",
+  'a real render before returning it.',
   '',
   'Image-gen seats (canonical slug):',
   ...listModelHelpLines({ imageOnly: true }),
-  `Default: ${DEFAULT_IMAGE_GEN} (gpt-image-2 via codex; historical default).`,
+  `Default: ${DEFAULT_IMAGE_GEN}.`,
 ].join('\n');
 
 export const imageGen = buildCommand({
@@ -25,15 +25,14 @@ export const imageGen = buildCommand({
       out: {
         kind: 'parsed',
         parse: String,
-        optional: true,
-        brief: 'Path to write the image (default: ./aibridge-image.png)',
+        brief:
+          'Path to write the image — extension must match the seat format (.png for codex, .jpg for agy/grok)',
       },
-      size: {
+      aspectRatio: {
         kind: 'parsed',
         parse: String,
         optional: true,
-        brief:
-          'WIDTHxHEIGHT (codex: each edge ÷16; grok: mapped to aspect_ratio, then optionally resized)',
+        brief: 'Aspect ratio N:M, e.g. 16:9 (agy/grok: real tool param; codex: prompt hint)',
       },
       image: {
         kind: 'parsed',
@@ -41,12 +40,6 @@ export const imageGen = buildCommand({
         optional: true,
         brief: 'Reference image path(s), comma-separated — visual reference',
       },
-      quality: {
-        kind: 'parsed',
-        parse: String,
-        optional: true,
-        brief: 'low | medium | high (codex/gpt-image-2; default high)',
-      },
       timeout: {
         kind: 'parsed',
         parse: positiveIntSeconds,

package/src/commands/image-gen/impl.ts

@@ -10,30 +10,30 @@ import {
 } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
-import { isNotFound, runCaptured } from '@aibridge/proc';
 import type { LocalContext } from '../../context.ts';
 import type { ImageResult } from '../../driver.ts';
 import { getDriver } from '../../drivers.ts';
 import {
+  backendModelId,
   DEFAULT_IMAGE_GEN,
   formatImageGenModelError,
   formatUnknownModelError,
+  imageFormatFor,
   resolveModel,
   supportsImageGen,
 } from '../../models.ts';
 
 export interface ImageGenFlags {
   readonly model?: string;
-  readonly out?: string;
-  readonly size?: string;
+  readonly out: string;
+  readonly aspectRatio?: string;
   readonly image?: string;
-  readonly quality?: string;
   readonly timeout?: number;
   readonly json: boolean;
 }
 
 const MIN_REAL_BYTES_CODEX = 100_000;
-const MIN_REAL_BYTES_GROK = 10_000;
+const MIN_REAL_BYTES_TOOL = 10_000;
 
 export default async function imageGen(
   this: LocalContext,
@@ -52,30 +52,32 @@ export default async function imageGen(
 
   if (model.spec.backend === 'codex' && model.effort) {
     return fail(
-      `effort "-${model.effort}" has no effect on image-gen (gpt-image-2 renders, not the seat model); use ${DEFAULT_IMAGE_GEN}.`,
+      `effort "-${model.effort}" has no effect on image-gen (the image tool renders, not the seat model); use ${DEFAULT_IMAGE_GEN}.`,
     );
   }
 
-  const quality = (flags.quality ?? 'high').toLowerCase();
-  if (!['low', 'medium', 'high'].includes(quality)) {
-    return fail(`invalid --quality "${flags.quality}" (use low | medium | high)`);
+  const expected = imageFormatFor(model);
+  if (expected === undefined) return fail(formatImageGenModelError(inputSlug, model));
+
+  const label = expected === 'png' ? 'PNG' : 'JPEG';
+  const extValid = expected === 'png' ? /\.png$/i.test(flags.out) : /\.jpe?g$/i.test(flags.out);
+  if (!extValid) {
+    return fail(
+      `--out "${flags.out}" must end in ${expected === 'png' ? '.png' : '.jpg or .jpeg'} — the ${model.spec.slug} seat renders ${label} and aibridge does not convert.`,
+    );
   }
 
-  let size: { w: number; h: number } | undefined;
-  if (flags.size !== undefined) {
-    const m = flags.size.match(/^(\d+)\s*x\s*(\d+)$/i);
-    if (!m) return fail(`invalid --size "${flags.size}" (expected e.g. 1024x1024)`);
-    size = { w: Number(m[1]), h: Number(m[2]) };
-    if (model.spec.backend === 'codex') {
-      const constraint = sizeConstraintError(size.w, size.h);
-      if (constraint) return fail(`invalid --size ${size.w}x${size.h}: ${constraint}`);
-    } else if (size.w < 1 || size.h < 1) {
-      return fail(`invalid --size ${size.w}x${size.h}: dimensions must be positive`);
+  let aspectRatio: string | undefined;
+  if (flags.aspectRatio !== undefined) {
+    const m = flags.aspectRatio.match(/^(\d+)\s*:\s*(\d+)$/);
+    if (!m || Number(m[1]) < 1 || Number(m[2]) < 1) {
+      return fail(`invalid --aspect-ratio "${flags.aspectRatio}" (expected e.g. 16:9)`);
     }
+    aspectRatio = `${Number(m[1])}:${Number(m[2])}`;
   }
 
   const timeoutSec = flags.timeout ?? 600;
-  const outPath = resolve(this.process.cwd(), flags.out ?? './aibridge-image.png');
+  const outPath = resolve(this.process.cwd(), flags.out);
 
   const imagePaths: string[] = [];
   if (flags.image !== undefined) {
@@ -94,17 +96,16 @@ export default async function imageGen(
     return fail(formatImageGenModelError(inputSlug, model));
   }
 
-  const minBytes = model.spec.backend === 'codex' ? MIN_REAL_BYTES_CODEX : MIN_REAL_BYTES_GROK;
+  const minBytes = model.spec.backend === 'codex' ? MIN_REAL_BYTES_CODEX : MIN_REAL_BYTES_TOOL;
   const work = mkdtempSync(join(tmpdir(), 'aibridge-imagegen-'));
 
   try {
     let outcome: ImageResult = await driver.generateImage({
       prompt,
       workDir: work,
-      backendModel: model.spec.backendModel,
+      backendModel: backendModelId(model),
       effort: model.effort,
-      quality,
-      size,
+      aspectRatio,
       imagePaths,
       timeoutSec,
       forceful: false,
@@ -115,10 +116,9 @@ export default async function imageGen(
       outcome = await driver.generateImage({
         prompt,
         workDir: work,
-        backendModel: model.spec.backendModel,
+        backendModel: backendModelId(model),
         effort: model.effort,
-        quality,
-        size,
+        aspectRatio,
         imagePaths,
         timeoutSec,
         forceful: true,
@@ -133,42 +133,29 @@ export default async function imageGen(
     if (outcome.kind === 'error') return fail(outcome.reason);
     if (outcome.kind === 'suspect') {
       return fail(
-        model.spec.backend === 'grok'
-          ? 'grok produced no usable image. Check SuperGrok image access and re-run with a simpler prompt.'
-          : 'codex produced only a tiny/code-drawn image, not a real gpt-image-2 render. ' +
-              'Try --quality high or a clearer, simpler prompt.',
+        model.spec.backend === 'agy'
+          ? 'agy produced no usable image. Re-run with a simpler prompt, or check Antigravity image access.'
+          : model.spec.backend === 'grok'
+            ? 'grok produced no usable image. Check SuperGrok image access and re-run with a simpler prompt.'
+            : 'codex produced only a tiny/code-drawn image, not a real render. ' +
+              'Try a clearer, simpler prompt.',
       );
     }
 
     const local = join(work, 'result.bin');
     copyFileSync(outcome.path, local);
 
-    let dims = imageSize(local);
-    if (size && dims && (dims.width !== size.w || dims.height !== size.h)) {
-      const resized = await magick([local, '-resize', `${size.w}x${size.h}!`, local]);
-      if (resized) {
-        dims = imageSize(local) ?? dims;
-      } else {
-        this.process.stderr.write(
-          `aibridge image-gen: rendered ${dims.width}x${dims.height}, wanted ${size.w}x${size.h}, ` +
-            'and ImageMagick (magick/convert) is unavailable to resize.\n',
-        );
-      }
-    }
+    const dims = imageSize(local);
+    const actual = pngSize(local) ? 'png' : jpegSize(local) ? 'jpg' : null;
 
-    const outExt = /\.png$/i.test(outPath) ? 'png' : /\.jpe?g$/i.test(outPath) ? 'jpg' : null;
-    const actualFmt = pngSize(local) ? 'png' : jpegSize(local) ? 'jpg' : null;
-    const needsConvert = outExt !== null && actualFmt !== null && outExt !== actualFmt;
-    if (!needsConvert || !(await magick([local, outPath]))) {
-      if (needsConvert) {
-        this.process.stderr.write(
-          `aibridge image-gen: render is ${actualFmt.toUpperCase()} but out path wants ` +
-            `${outExt.toUpperCase()}, and ImageMagick (magick/convert) is unavailable to convert; ` +
-            'writing the raw bytes as-is.\n',
-        );
-      }
-      copyFileSync(local, outPath);
+    // ponytail: guard for a backend changing formats in the future without throwing away a paid render
+    if (actual !== null && actual !== expected) {
+      this.process.stderr.write(
+        `aibridge image-gen: expected a ${label} render from this seat but got ${actual === 'png' ? 'PNG' : 'JPEG'}; wrote the raw bytes to ${outPath} anyway — the extension does not match the contents.\n`,
+      );
     }
+
+    copyFileSync(local, outPath);
     const bytes = statSync(outPath).size;
 
     if (flags.json) {
@@ -178,8 +165,7 @@ export default async function imageGen(
           bytes,
           width: dims?.width ?? null,
           height: dims?.height ?? null,
-          sizeRequested: flags.size ?? null,
-          quality: model.spec.backend === 'codex' ? quality : null,
+          aspectRatio: flags.aspectRatio ?? null,
           model: model.spec.slug,
           backend: model.spec.backend,
           real: true,
@@ -188,27 +174,13 @@ export default async function imageGen(
     } else {
       const kb = Math.round(bytes / 1024);
       const dimStr = dims ? `${dims.width}x${dims.height}, ` : '';
-      const qualityStr = model.spec.backend === 'codex' ? `, ${quality} quality` : '';
-      this.process.stdout.write(
-        `✓ Wrote ${outPath} (${dimStr}${kb} KB${qualityStr}, ${model.spec.slug})\n`,
-      );
+      this.process.stdout.write(`✓ Wrote ${outPath} (${dimStr}${kb} KB, ${model.spec.slug})\n`);
     }
   } finally {
     rmSync(work, { recursive: true, force: true });
   }
 }
 
-function sizeConstraintError(w: number, h: number): string | null {
-  if (w % 16 !== 0 || h % 16 !== 0) return 'each edge must be divisible by 16';
-  const long = Math.max(w, h);
-  const short = Math.min(w, h);
-  if (long / short > 3) return 'aspect ratio must be within 1:3–3:1';
-  if (long > 3840) return 'longest edge must be <= 3840px';
-  const px = w * h;
-  if (px < 655_360 || px > 8_294_400) return 'total pixels must be 655,360–8,294,400';
-  return null;
-}
-
 function imageSize(path: string): { width: number; height: number } | null {
   return pngSize(path) ?? jpegSize(path);
 }
@@ -254,15 +226,3 @@ function jpegSize(path: string): { width: number; height: number } | null {
     return null;
   }
 }
-
-async function magick(args: readonly string[]): Promise<boolean> {
-  for (const tool of ['magick', 'convert']) {
-    try {
-      const r = await runCaptured(tool, [...args], { timeoutMs: 60_000 });
-      if (!r.timedOut && r.code === 0) return true;
-    } catch (err) {
-      if (!isNotFound(err)) throw err;
-    }
-  }
-  return false;
-}

package/src/commands/subagent/impl.ts

@@ -72,10 +72,9 @@ export default async function subagent(
   }
 
   if (flags.json) {
-    const modelId = backendModelId(model) ?? null;
     this.process.stdout.write(
       `${JSON.stringify({
-        model: modelId,
+        model: backendModelId(model),
         slug: model.spec.slug,
         response: outcome.response,
         exitCode: outcome.exitCode,

package/src/delegate.ts

@@ -29,7 +29,7 @@ export async function delegate(
     tools: opts.tools,
     timeoutSec: opts.timeoutSec,
     cwd: opts.cwd,
-    backendModel: backendModelId(opts.model) ?? opts.model.spec.backendModel,
+    backendModel: backendModelId(opts.model),
     effort: opts.model.effort,
     onStdout: c => opts.run.stdout(c),
     onStderr: c => opts.run.stderr(c),

package/src/driver.ts

@@ -12,7 +12,7 @@ export interface DelegationTask {
   readonly tools: boolean;
   readonly timeoutSec: number;
   readonly cwd: string;
-  readonly backendModel: string | undefined;
+  readonly backendModel: string;
   readonly effort: Effort | undefined;
   readonly onStdout?: (chunk: string) => void;
   readonly onStderr?: (chunk: string) => void;
@@ -33,10 +33,9 @@ export type QuotaSnapshot = AgyQuotaSnapshot | CodexQuotaSnapshot | ClaudeQuotaS
 export interface ImageGenRequest {
   readonly prompt: string;
   readonly workDir: string;
-  readonly backendModel: string | undefined;
+  readonly backendModel: string;
   readonly effort: Effort | undefined;
-  readonly quality: string;
-  readonly size: { readonly w: number; readonly h: number } | undefined;
+  readonly aspectRatio: string | undefined;
   readonly imagePaths: readonly string[];
   readonly timeoutSec: number;
   readonly forceful: boolean;

package/src/drivers.ts

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

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,20 +70,28 @@ 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>;
 
@@ -88,10 +99,20 @@ 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';
 
-const IMAGE_GEN_BACKENDS: ReadonlySet<Backend> = new Set(['codex', 'grok']);
+export type ImageFormat = 'jpg' | 'png';
+
+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 +143,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 +156,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,