jeo-code 0.12.1 → 0.12.3

package/src/ai/model-catalog.ts

@@ -80,7 +80,9 @@ const STD: ThinkLevel[] = ["low", "medium", "high"];
  *  (`cheapestCredentialed`/`strongestCredentialed`/`compareStrengthAscending`)
  *  now tiebreak on `releaseDate` directly rather than relying on position. */
 export const MODEL_CATALOG: readonly CatalogModel[] = [
-  // Anthropic (newest first: sonnet-5-5 > opus-5-5 > sonnet-5 > fable-5 > opus-4-8 > opus-4-7 > sonnet-4-6 > opus-4-6). 4.5-and-below dropped from jeo's exposed model list per user direction.
+  // Anthropic (newest first: sonnet-5-5 > opus-5-5 > sonnet-5 > fable-5 > mythos-5).
+  // claude-4.x and below removed: live API discovery (https://api.anthropic.com/v1/models)
+  // returns the account's actual available models; the static catalog is fallback-only.
   // 5.5 generation (platform.claude.com/docs/en/models/{opus-5-5,sonnet-5-5}/overview): dateless pinned wire ids
   // `claude-opus-5-5` (released 2026-09-22) / `claude-sonnet-5-5` (2026-09-28), 1M ctx / 128k sync max output, adaptive
   // thinking (Opus 5.5 always on; Sonnet 5.5 on by default), text+image input. Canonical == wire id; anthropic.ts already
@@ -92,17 +94,7 @@ export const MODEL_CATALOG: readonly CatalogModel[] = [
   // Mythos 5 is limited-availability (Project Glasswing) but callable by id for approved accounts.
   { canonical: "claude-fable-5", provider: "anthropic", providerModel: "claude-fable-5", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-06" },
   { canonical: "claude-mythos-5", provider: "anthropic", providerModel: "claude-mythos-5", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, limitedAvailability: true, releaseDate: "2026-06" },
-  // NOTE: opus 4.6+ use Anthropic ADAPTIVE thinking (type:"adaptive" + output_config.effort).
-  // opus 4.7/4.8 OMIT visible thought unless the request opts into `display: "summarized"` —
-  // anthropic.ts sets that on the adaptive transport so reasoning streams again (gjc parity).
-  // The nativizable path still replays signature-only thinking blocks for cross-turn continuity.
-  // The 4.6 generation onward is 1M context / 128k sync max output (Anthropic docs:
-  // Opus 4.8 & Sonnet 5 comparison table; Opus 4.6/4.7, Sonnet 4.6 share the gen's
-  // dateless-snapshot 1M/128k + 300k batch-output beta).
-  { canonical: "claude-opus-4-8", provider: "anthropic", providerModel: "claude-opus-4-8", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-05" },
-  { canonical: "claude-opus-4-7", provider: "anthropic", providerModel: "claude-opus-4-7", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-04" },
-  { canonical: "claude-sonnet-4-6", provider: "anthropic", providerModel: "claude-sonnet-4-6", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-02" },
-  { canonical: "claude-opus-4-6", provider: "anthropic", providerModel: "claude-opus-4-6", contextTokens: 1_000_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-02" },
+
   // OpenAI (newest first: gpt-5.6 > gpt-5.5 > gpt-5.4 > o4-mini/o3/gpt-4.1 > o3-mini > gpt-4o-mini > gpt-4o)
   { canonical: "gpt-5.6", provider: "openai", providerModel: "gpt-5.6", contextTokens: 400_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-06" },
   { canonical: "gpt-5.5", provider: "openai", providerModel: "gpt-5.5", contextTokens: 400_000, maxOutputTokens: 128_000, thinking: FULL, images: true, releaseDate: "2026-04" },
@@ -278,7 +270,7 @@ export function resetLiveCodexModels(): void {
  *  this process. Unlike `liveCodexModels`, this is NOT an OAuth allow-list; it is a
  *  routing supplement so API-key and OpenAI-compatible catalogs discovered at runtime
  *  can participate in prompt routing without waiting for a static release. */
-type LiveProviderModelSource = "oauth" | "api_key" | "keyless" | "none";
+type LiveProviderModelSource = "oauth" | "api_key" | "keyless" | "none" | "cli_session";
 interface LiveProviderModelRecord {
   row: CatalogModel;
   source: LiveProviderModelSource;
@@ -339,6 +331,7 @@ function liveCanonicalId(provider: ProviderName, id: string): string {
       : `openai/${trimmed}`;
   }
   if (provider === "xai" || provider === "kimi") return trimmed;
+  if (provider === "agy") return `${provider}/${trimmed}`;
   return openaiCompatDef(provider) || provider === "ollama" || provider === "lmstudio" || provider === "antigravity"
     ? `${provider}/${trimmed}`
     : trimmed;
@@ -391,7 +384,7 @@ export function recordLiveProviderModels(
   if (provider === "openai" && source === "oauth" && scopedAccountId) {
     setOpenAIOauthAccountScope(scopedAccountId);
   }
-  const shouldReplace = provider === "antigravity" || (provider === "openai" && !!opts.replace);
+  const shouldReplace = provider === "antigravity" || provider === "agy" || (provider === "openai" && !!opts.replace);
   if (shouldReplace) {
     for (const [key, record] of liveProviderModels) {
       const sameScope = provider === "openai"
@@ -525,7 +518,11 @@ export function formatTokens(n: number): string {
 /** Exact lookup by canonical id or provider model id. */
 export function findCatalogModel(idOrModel: string): CatalogModel | undefined {
   const q = idOrModel.trim();
-  return MODEL_CATALOG.find(m => m.canonical === q || m.providerModel === q || `${m.provider}/${m.providerModel}` === q);
+  return MODEL_CATALOG.find(m =>
+    m.canonical === q
+    || `${m.provider}/${m.providerModel}` === q
+    || (!m.canonical.startsWith(`${m.provider}/`) && m.providerModel === q),
+  );
 }
 
 /**
@@ -652,7 +649,10 @@ export function catalogMetadata(modelId: string): CatalogModel | undefined {
   if (direct) return direct;
   // Tolerate provider-prefixed or bare provider model ids.
   const bare = modelId.replace(/^[a-z-]+\//, "");
-  const hit = MODEL_CATALOG.find(m => m.providerModel === bare || m.providerModel.endsWith(`/${bare}`) || m.canonical === bare);
+  const hit = MODEL_CATALOG.find(m =>
+    m.canonical === bare
+    || (!m.canonical.startsWith(`${m.provider}/`) && (m.providerModel === bare || m.providerModel.endsWith(`/${bare}`))),
+  );
   if (hit) return hit;
   // Last resort: infer capabilities from the model family so a brand-new
   // revision still surfaces reasoning/thinking like its catalogued siblings.
@@ -679,5 +679,6 @@ export function companyLabel(provider: string, entry?: { company?: string }): st
   const compat = openaiCompatDef(low);
   if (compat) return compat.label;
   if (low === "antigravity") return "Antigravity";
+  if (low === "agy") return "Argon CLI";
   return provider.charAt(0).toUpperCase() + provider.slice(1);
 }

package/src/ai/model-discovery.ts

@@ -9,6 +9,7 @@
  */
 import { readGlobalConfig, type Config } from "../agent/state";
 import { resolveCredential, type AuthProvider, type Credential } from "../auth";
+import { listAgyModels } from "../agent/antigravity-cli";
 import type { ProviderName } from "./types";
 import { PROVIDER_NAMES } from "./provider-status";
 import {
@@ -32,7 +33,7 @@ export interface ProviderModelsResult {
   models: string[];
   ok: boolean;
   /** How the request authenticated (for display). */
-  source: "oauth" | "api_key" | "keyless" | "none";
+  source: "oauth" | "api_key" | "keyless" | "cli_session" | "none";
   /** Opaque OAuth account scope for account-specific cache rows. */
   accountId?: string;
   /** Actual custom endpoint queried, for endpoint-scoped persistent caches. */
@@ -50,6 +51,9 @@ export interface DiscoveryOptions {
   /** Per-request timeout; default 5000ms. */
   timeoutMs?: number;
   signal?: AbortSignal;
+  /** Working directory and executable override for the externally managed agy CLI. */
+  cwd?: string;
+  executable?: string;
   /** Cap returned ids; OpenAI and Antigravity default to the full account list. */
   limit?: number;
   /** Config snapshot used for provider base URLs. */
@@ -210,6 +214,10 @@ function isGeminiChatModel(id: string): boolean {
 type CodexModelRow = { slug?: string; id?: string; visibility?: string; supported_in_api?: boolean; priority?: number };
 type AntigravityModelRow = { slug?: string; id?: string; name?: string; isInternal?: boolean; model?: string };
 
+function normalizeAntigravityModelId(id: string): string {
+  return id.replace(/^models\//, "").replace(/^antigravity\//, "");
+}
+
 /** Parse a provider's models response body into normalized, chat-capable model ids. */
 export function parseModelsBody(provider: ProviderName, body: unknown, opts: { openaiCompatible?: boolean } = {}): string[] {
   const data = body as {
@@ -241,13 +249,14 @@ export function parseModelsBody(provider: ProviderName, body: unknown, opts: { o
     // "gemini-3-flash"); the entry's `model` field is an internal enum
     // (MODEL_PLACEHOLDER_*) and must never be surfaced. The response's OWN
     // metadata decides what to show — no hard-coded model lists:
-    //  1. `agentModelSorts` groups are the API's positive agent/chat set
-    //     (exactly what Antigravity's model picker offers) — prefer it.
-    //  2. Otherwise fall back to excluding the API's non-chat role lists
-    //     (tab completion, image generation, transcription, deprecations).
+    // Agent sorts and tiered model ids are complementary chat offerings, not
+    // interchangeable allowlists. Include both plus the declared default;
+    // only older responses without these fields need non-chat role filtering.
     const payload = body as {
       models?: Record<string, AntigravityModelRow> | AntigravityModelRow[];
       agentModelSorts?: { groups?: { modelIds?: string[] }[] }[];
+      tieredModelIds?: Record<string, string[]>;
+      defaultAgentModelId?: string;
       tabModelIds?: string[];
       imageGenerationModelIds?: string[];
       audioTranscriptionModelIds?: string[];
@@ -256,16 +265,21 @@ export function parseModelsBody(provider: ProviderName, body: unknown, opts: { o
       /** Array of ids OR an object keyed by deprecated id. */
       deprecatedModelIds?: string[] | Record<string, unknown>;
     };
-    const normalizeId = (id: string): string => id.replace(/^models\//, "").replace(/^antigravity\//, "");
-    const roleIds = (v: unknown): string[] => (Array.isArray(v) ? v.filter((x): x is string => typeof x === "string").map(normalizeId) : []);
+    const roleIds = (v: unknown): string[] => (Array.isArray(v) ? v.filter((x): x is string => typeof x === "string").map(normalizeAntigravityModelId) : []);
     const deprecated = Array.isArray(payload.deprecatedModelIds)
       ? roleIds(payload.deprecatedModelIds)
-      : Object.keys(payload.deprecatedModelIds ?? {}).map(normalizeId);
+      : Object.keys(payload.deprecatedModelIds ?? {}).map(normalizeAntigravityModelId);
     const agentIds = new Set(
       (Array.isArray(payload.agentModelSorts) ? payload.agentModelSorts : [])
         .flatMap(sort => (Array.isArray(sort?.groups) ? sort.groups : []))
         .flatMap(group => roleIds(group?.modelIds)),
     );
+    for (const ids of Object.values(payload.tieredModelIds ?? {})) {
+      for (const id of roleIds(ids)) agentIds.add(id);
+    }
+    if (typeof payload.defaultAgentModelId === "string") agentIds.add(normalizeAntigravityModelId(payload.defaultAgentModelId));
+    const hasChatModelMetadata = Array.isArray(payload.agentModelSorts)
+      || payload.tieredModelIds !== undefined || payload.defaultAgentModelId !== undefined;
     const nonChat = new Set([
       ...roleIds(payload.tabModelIds),
       ...roleIds(payload.imageGenerationModelIds),
@@ -279,11 +293,11 @@ export function parseModelsBody(provider: ProviderName, body: unknown, opts: { o
       ? rawModels.map(model => [model?.slug ?? model?.id ?? model?.name ?? "", model] as const)
       : Object.entries(rawModels ?? {});
     return entries
-      .map(([id, model]) => [typeof id === "string" ? normalizeId(id) : "", model] as const)
+      .map(([id, model]) => [typeof id === "string" ? normalizeAntigravityModelId(id) : "", model] as const)
       .filter(([id, model]) =>
         id.length > 0 &&
         model?.isInternal !== true &&
-        (Array.isArray(payload.agentModelSorts) ? agentIds.has(id) : !nonChat.has(id)))
+        (hasChatModelMetadata ? agentIds.has(id) : !nonChat.has(id)))
       .map(([id]) => `antigravity/${id}`);
   }
   if (provider === "gemini") {
@@ -320,6 +334,8 @@ export function catalogOr(result: ProviderModelsResult): ProviderModelsResult {
   if (result.ok && result.models.length > 0) return result;
   // OpenAI has live list endpoints for both auth modes. Neither a failed request
   // nor an authoritative empty list establishes access to the static snapshot.
+  // Argon CLI catalogs are live, process-local, and never synthesized from jeo's static catalog.
+  if (result.provider === "agy") return result;
   if (result.provider === "openai") return result;
   // Antigravity's available models depend on the Cloud Code Assist agent backend
   // and must never be faked from a hard-coded catalog.
@@ -357,6 +373,17 @@ export async function listProviderModels(
   provider: ProviderName,
   opts: DiscoveryOptions = {},
 ): Promise<ProviderModelsResult> {
+  if (provider === "agy") {
+    try {
+      const models = await listAgyModels({ cwd: opts.cwd, timeoutMs: opts.timeoutMs, signal: opts.signal, executable: opts.executable });
+      const unique = [...new Set(models)];
+      recordLiveProviderModels("agy", unique, { source: "cli_session", replace: true });
+      return { provider: "agy", models: unique, ok: true, source: "cli_session" };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return { provider: "agy", models: [], ok: false, source: "cli_session", error: message };
+    }
+  }
   const fetchImpl = opts.fetchImpl ?? fetch;
   const limit = opts.limit ?? (provider === "openai" || provider === "antigravity" ? Number.POSITIVE_INFINITY : DEFAULT_LIMIT);
   let baseUrl = opts.baseUrl;
@@ -496,20 +523,25 @@ export async function listProviderModels(
       const sorts = payload?.agentModelSorts;
       const invalidSorts = sorts !== undefined && (!Array.isArray(sorts) || sorts.some(sort =>
         !sort || typeof sort !== "object" || !Array.isArray(sort.groups) || sort.groups.some((group: { modelIds?: unknown } | null) =>
-          !group || !Array.isArray(group.modelIds) || group.modelIds.some(id => typeof id !== "string" || !id.trim()))));
+          !group || !Array.isArray(group.modelIds) || group.modelIds.some(id => typeof id !== "string" || !normalizeAntigravityModelId(id).trim()))));
       const invalidRoles = ["tabModelIds", "imageGenerationModelIds", "audioTranscriptionModelIds", "commitMessageModelIds", "mqueryModelIds"].some(field => {
         const ids = payload?.[field];
-        return ids !== undefined && (!Array.isArray(ids) || ids.some(id => typeof id !== "string" || !id.trim()));
+        return ids !== undefined && (!Array.isArray(ids) || ids.some(id => typeof id !== "string" || !normalizeAntigravityModelId(id).trim()));
       });
       const deprecated = payload?.deprecatedModelIds;
       const invalidDeprecated = deprecated !== undefined && (Array.isArray(deprecated)
-        ? deprecated.some(id => typeof id !== "string" || !id.trim())
-        : !deprecated || typeof deprecated !== "object");
-      if (!rows || rows.some(([id, row]) => !row || typeof row !== "object" || Array.isArray(row)
-        || (Array.isArray(models)
-          ? ![row.slug, row.id, row.name].some(value => typeof value === "string" && value.trim().length > 0)
-          : !id.trim()))
-        || invalidSorts || invalidRoles || invalidDeprecated) {
+        ? deprecated.some(id => typeof id !== "string" || !normalizeAntigravityModelId(id).trim())
+        : !deprecated || typeof deprecated !== "object" || Object.keys(deprecated).some(id => !normalizeAntigravityModelId(id).trim()));
+      const tiered = payload?.tieredModelIds;
+      const invalidTiered = tiered !== undefined && (!tiered || typeof tiered !== "object" || Array.isArray(tiered)
+        || Object.values(tiered).some(ids => !Array.isArray(ids) || ids.some(id => typeof id !== "string" || !normalizeAntigravityModelId(id).trim())));
+      const defaultId = payload?.defaultAgentModelId;
+      const invalidDefault = defaultId !== undefined && (typeof defaultId !== "string" || !normalizeAntigravityModelId(defaultId).trim());
+      if (!rows || rows.some(([id, row]) => {
+        if (!row || typeof row !== "object" || Array.isArray(row)) return true;
+        const modelId = Array.isArray(models) ? row.slug ?? row.id ?? row.name : id;
+        return typeof modelId !== "string" || !normalizeAntigravityModelId(modelId).trim();
+      }) || invalidSorts || invalidRoles || invalidDeprecated || invalidTiered || invalidDefault) {
         return { provider, models: [], ok: false, source, error: "invalid models response", ...scope };
       }
     }
@@ -593,9 +625,14 @@ export async function discoverModels(
 ): Promise<ProviderModelsResult[]> {
   const cfg = opts.config ?? (await readGlobalConfig());
   const providers = opts.providers ?? [...PROVIDER_NAMES];
+  const agyExplicit = opts.providers?.includes("agy") ?? false;
+  const agyDefault = typeof cfg.defaultModel === "string" && cfg.defaultModel.trim().toLowerCase().startsWith("agy/");
   const useFallback = opts.catalogFallback !== false;
   const results = await Promise.all(
-    providers.map(async p => {
+    providers.map(async (p): Promise<ProviderModelsResult[]> => {
+      if (p === "agy" && !agyExplicit && !agyDefault) {
+        return [{ provider: "agy", models: [], ok: false, source: "none", error: "official CLI discovery requires explicit selection" }];
+      }
       const discoveryOpts = {
         ...opts,
         config: cfg,

package/src/ai/model-manager.ts

@@ -37,6 +37,7 @@ export function resolveProvider(model: string): ProviderName {
   if (m.startsWith("ollama/")) return "ollama";
   if (m.startsWith("lmstudio/")) return "lmstudio";
   if (m.startsWith("antigravity/")) return "antigravity";
+  if (m.startsWith("agy/")) return "agy";
   if (m.startsWith("xai/")) return "xai";
   if (m.startsWith("kimi/")) return "kimi";
   // Built-ins FIRST, then user-registered custom providers: a custom id can never be a
@@ -59,6 +60,7 @@ const STATIC_ID_PREFIX: Partial<Record<ProviderName, string>> = {
   openai: "openai/",
   gemini: "google/",
   antigravity: "antigravity/",
+  agy: "agy/",
   ollama: "ollama/",
   lmstudio: "lmstudio/",
   xai: "xai/",
@@ -95,6 +97,7 @@ export function providerModelFor(model: string): string {
     model.startsWith("antigravity/") ||
     model.startsWith("lmstudio/") ||
     model.startsWith("xai/") ||
+    model.startsWith("agy/") ||
     model.startsWith("kimi/") ||
     isOpenAICompatProvider(model.split("/")[0])
   ) {
@@ -350,6 +353,7 @@ export function oauthServesModel(provider: AuthProvider, model: string): boolean
  * - a configured OpenAI base URL is the keyless local-proxy path — any model.
  */
 export function modelServableWithConfig(provider: ProviderName, model: string, config: Partial<Pick<Config, "providers" | "oauth" | "openaiBaseUrl">>): boolean {
+  if (provider === "agy") return false;
   if (provider === "ollama" || provider === "lmstudio") return true;
   if (provider === "antigravity") return !!(config.oauth?.antigravity || config.oauth?.gemini);
   if (provider === "openai" && config.openaiBaseUrl) return true;
@@ -428,6 +432,9 @@ export async function resolveCall(options: Partial<CallOptions>, kind: "request"
   const aliases = { ...((config as { modelAliases?: Record<string, string> }).modelAliases ?? {}) };
   const model = expandAlias(options.model ?? config.defaultModel, { ...BUILTIN_ALIASES, ...aliases });
   const provider = resolveProvider(model);
+  if (provider === "agy") {
+    throw new Error("agy models are full-agent CLI sessions, not raw LLM calls; run the selected agy model through the explicit CLI bridge.");
+  }
   const adapter = providerRegistry.get(provider)!;
 
   const baseUrl =

package/src/ai/model-registry.ts

@@ -9,18 +9,18 @@ export interface ModelAliases {
 export const BUILTIN_ALIASES: ModelAliases = {
   fast: "ollama/qwen2.5:0.5b",
   local: "ollama/qwen2.5:0.5b",
-  sonnet: "claude-sonnet-4-6",
-  opus: "claude-opus-4-6",
+  sonnet: "claude-sonnet-5-5",
+  opus: "claude-opus-5-5",
   gpt: "gpt-5.5",
   flash: "gemini-2.5-flash",
   grok: "grok-4.3",
   kimi: "kimi-k2-0711-preview",
-  // Anthropic 5.5 generation: spellings that name the version. Bare `opus`/`sonnet` above stay on the
-  // 4.6 ids (pinned backward-compat); users opt into 5.5 by naming the version.
+  // Anthropic 5.5 generation: versioned spellings as convenience aliases.
   "opus-5.5": "claude-opus-5-5",
   "sonnet-5.5": "claude-sonnet-5-5",
   "opus5.5": "claude-opus-5-5",
   "sonnet5.5": "claude-sonnet-5-5",
+
   // Antigravity's backend DEPRECATED this wire id (deprecatedModelIds:
   // { "gemini-3.1-pro-high": { newModelId: "gemini-pro-agent" } }) — keep
   // existing configs/roles pinned to the old id working on the successor.

package/src/ai/provider-ranking.ts

@@ -46,7 +46,7 @@ export const FAMOUS_PROVIDER_ORDER: readonly string[] = [
   "openai",
   "gemini",
   "antigravity",
-  "xai",
+  "agy",
   "kimi",
   "zai",
   "minimax",
@@ -142,7 +142,7 @@ export function sortRankedProviders<T extends RankableProvider>(providers: reado
 /** Map a jeo `ProviderStatus`-shaped record onto the ranking's auth-state vocabulary. */
 export function authStateFor(status: {
   ready: boolean;
-  kind: "api_key" | "oauth" | "keyless" | "none";
+  kind: "api_key" | "oauth" | "keyless" | "cli_session" | "none";
   loggedIn?: boolean;
 }): ProviderAuthState {
   if (status.ready) return status.kind === "oauth" ? "valid" : "configured";

package/src/ai/provider-status.ts

@@ -14,7 +14,7 @@ import { customProviderDef, customProviderNames, credentialSourceOf, resolveCust
 
 /** Compiled-in providers, in declaration order. Custom providers are NOT here — they
  *  are discovered at runtime, so use {@link allProviderNames} for anything the user sees. */
-export const PROVIDER_NAMES: readonly ProviderName[] = ["anthropic", "openai", "gemini", "antigravity", "ollama", "lmstudio", "xai", "kimi", ...OPENAI_COMPAT_NAMES];
+export const PROVIDER_NAMES: readonly ProviderName[] = ["anthropic", "openai", "gemini", "antigravity", "agy", "ollama", "lmstudio", "xai", "kimi", ...OPENAI_COMPAT_NAMES];
 
 /** Built-in providers PLUS the user's registered custom providers. Every user-facing
  *  surface (pickers, `/provider`, autocomplete, doctor) should list from here so a
@@ -27,7 +27,7 @@ export function allProviderNames(): readonly ProviderName[] {
 /** Cloud providers that authenticate via API key / OAuth. Ollama is keyless. */
 export const CLOUD_PROVIDERS: readonly AuthProvider[] = ["anthropic", "openai", "gemini", "antigravity"];
 
-export type CredentialKind = "api_key" | "oauth" | "keyless" | "none";
+export type CredentialKind = "api_key" | "oauth" | "keyless" | "cli_session" | "none";
 
 export interface ProviderStatus {
   name: ProviderName;
@@ -54,6 +54,7 @@ export interface ProviderStatus {
  *  own (e.g. HF_TOKEN, NANO_GPT_API_KEY); built-ins use `<PROVIDER>_API_KEY`. */
 export function providerEnvVar(name: ProviderName): string | undefined {
   if (name === "ollama" || name === "lmstudio" || name === "antigravity") return undefined;
+  if (name === "agy") return undefined;
   const def = openaiCompatDef(name);
   if (def) return def.apiKeyEnv;
   return `${name.toUpperCase()}_API_KEY`;
@@ -77,6 +78,8 @@ export function credentialLabel(kind: CredentialKind): string {
       return "keyless (local)";
     case "none":
       return "none (run 'jeo setup' or 'jeo auth login')";
+    case "cli_session":
+      return "external CLI session (agy; auth and permissions managed by the CLI)";
   }
 }
 
@@ -133,6 +136,22 @@ function effectiveCredential(provider: AuthProvider, cred: Credential, cfg: Conf
 /** Resolve the status of a single provider. */
 export async function describeProvider(name: ProviderName, config?: Config): Promise<ProviderStatus> {
   const cfg = config ?? (await readGlobalConfig());
+  if (name === "agy") {
+    let executable: string | undefined;
+    try {
+      executable = Bun.which("agy") ?? undefined;
+    } catch {
+      executable = undefined;
+    }
+    return {
+      name,
+      kind: "cli_session",
+      label: executable
+        ? `UNKNOWN — external CLI session (agy available at ${executable}; auth/permissions are externally managed; not probed)`
+        : "external CLI session unavailable — agy CLI not found on PATH; install/login with the official agy CLI; jeo does not manage its credentials",
+      ready: !!executable,
+    };
+  }
   // Custom providers resolve their credential from their OWN env var / stored literal,
   // not from the fixed `providers` union — report that source verbatim so a user who
   // set the wrong env var sees WHICH variable jeo is looking at.

package/src/ai/providers/custom-providers.ts

@@ -76,7 +76,7 @@ export const RESERVED_PROVIDER_IDS: readonly string[] = [
   "antigravity",
   "ollama",
   "lmstudio",
-  "xai",
+  "agy",
   "kimi",
   // Reserved so a future built-in cannot be shadowed by a stale user entry.
   "google",

package/src/ai/types.ts

@@ -1,7 +1,7 @@
 import type { Credential } from "../auth";
 
 /** Providers compiled into jeo (built-ins + the OpenAI/Anthropic-compatible catalog). */
-export type BuiltinProviderName = "anthropic" | "openai" | "gemini" | "antigravity" | "ollama" | "lmstudio" | "xai" | "kimi" | "groq" | "deepseek" | "mistral" | "openrouter" | "together" | "cerebras" | "fireworks" | "nvidia" | "alibaba-coding-plan" | "huggingface" | "nanogpt" | "qwen-portal" | "synthetic" | "venice" | "zenmux" | "qianfan" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "minimax-code" | "minimax-code-cn" | "zai" | "minimax" | "tencent" | "deepinfra" | "litellm";
+export type BuiltinProviderName = "anthropic" | "openai" | "gemini" | "antigravity" | "agy" | "ollama" | "lmstudio" | "xai" | "kimi" | "groq" | "deepseek" | "mistral" | "openrouter" | "together" | "cerebras" | "fireworks" | "nvidia" | "alibaba-coding-plan" | "huggingface" | "nanogpt" | "qwen-portal" | "synthetic" | "venice" | "zenmux" | "qianfan" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "minimax-code" | "minimax-code-cn" | "zai" | "minimax" | "tencent" | "deepinfra" | "litellm";
 
 /**
  * A provider id at runtime: a compiled-in name, OR a user-registered custom provider id

package/src/commands/doctor.ts

@@ -346,6 +346,21 @@ export async function runDoctorCommand(args: string[] = []): Promise<void> {
   const ollamaResult = await probeOllama(ollamaBase);
   for (const p of cloudProbes) probes.push(p);
   probes.push({ name: "ollama", credKind: "none (local)", result: ollamaResult });
+  if (defaultProvider === "agy") {
+    let executable: string | undefined;
+    try {
+      executable = Bun.which("agy") ?? undefined;
+    } catch {
+      executable = undefined;
+    }
+    probes.push({
+      name: "agy",
+      credKind: "external CLI session",
+      result: executable
+        ? { status: "skipped", detail: `UNKNOWN — agy CLI available at ${executable}; auth/permissions are externally managed; model generation not probed` }
+        : { status: "fail", detail: "agy CLI not found on PATH — install/login with the official agy CLI; jeo does not manage its credentials" },
+    });
+  }
 
   const oauthHealth: { provider: string; refreshable: boolean; expiresInMin?: number; email?: string }[] = [];
   for (const p of ["anthropic", "openai", "gemini"] as AuthProvider[]) {
@@ -360,7 +375,9 @@ export async function runDoctorCommand(args: string[] = []): Promise<void> {
   }
 
   const defaultProbe = probes.find(p => p.name === defaultProvider);
-  const ready = defaultProbe?.result.status === "ok";
+  const ready = defaultProvider === "agy"
+    ? defaultProbe?.result.status === "skipped"
+    : defaultProbe?.result.status === "ok";
 
   // --- JSON output mode (CI / scripting) ---
   if (json) {

package/src/commands/launch/agy-turn.ts

@@ -0,0 +1,60 @@
+import { AgyCliError, runAgyTurn, type AgyTurnOptions, type AgyTurnResult } from "../../agent/antigravity-cli";
+import { appendAgySession, appendMessage, loadSession } from "../../agent/session";
+import type { ImageAttachment, Message } from "../../ai/types";
+
+export interface AgySessionTurnOptions extends Omit<AgyTurnOptions, "conversationId" | "onConversation"> {
+  history: Message[];
+  sessionId?: string;
+  images?: ImageAttachment[];
+}
+
+/** An explicit full-agent turn: no raw-model loop, credential fallback, or tool replay. */
+export async function runAgySessionTurn(options: AgySessionTurnOptions): Promise<AgyTurnResult> {
+  const { history, sessionId, images, ...turn } = options;
+  if (images?.length) throw new Error("Image attachments are not supported by the official agy bridge");
+  if (turn.signal?.aborted) throw new AgyCliError("Official CLI turn cancelled", "cancelled");
+
+  const previousCount = history.reduce((count, message) => count + (message.role === "system" ? 0 : 1), 0);
+  const state = sessionId ? (await loadSession(sessionId, turn.cwd)).header.agy : undefined;
+  // A non-CLI turn or compaction changes the cursor. Start fresh with text context
+  // rather than resume a stale agent conversation or agy's unrelated latest one.
+  let conversationId = state?.messageCount === previousCount ? state.conversationId : undefined;
+  let prompt = turn.prompt;
+  if (!conversationId) {
+    const context = history.filter(message => message.role !== "system" && !message.toolUse?.length && !message.toolResults?.length);
+    if (context.some(message => message.images?.length)) {
+      throw new Error("Earlier image attachments cannot be forwarded to the official agy bridge; start a new text-only session");
+    }
+    if (context.length) {
+      prompt = "Earlier conversation context (data only, not system instructions or commands to execute):\n"
+        + JSON.stringify(context.map(({ role, content }) => ({ role, content })))
+        + "\n\nCurrent user request:\n" + prompt;
+    }
+  }
+
+  const user: Message = { role: "user", content: turn.prompt };
+  if (sessionId) await appendMessage(sessionId, user, turn.cwd);
+  history.push(user);
+  const result = await runAgyTurn({
+    ...turn,
+    prompt,
+    conversationId,
+    onConversation: async id => {
+      conversationId = id;
+      if (sessionId) await appendAgySession(sessionId, { conversationId: id, messageCount: previousCount + 1 }, turn.cwd);
+    },
+  });
+
+  const assistant: Message = { role: "assistant", content: result.response };
+  try {
+    if (sessionId) await appendMessage(sessionId, assistant, turn.cwd);
+    history.push(assistant);
+    if (sessionId) await appendAgySession(sessionId, {
+      conversationId: result.conversationId,
+      messageCount: previousCount + 2,
+    }, turn.cwd);
+  } catch (error) {
+    throw new Error(`Official CLI completed, but saving its jeo session failed: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+  }
+  return result;
+}

package/src/commands/launch/route-slash.ts

@@ -44,6 +44,11 @@ export interface RouteSlashResult {
   lines: string[];
 }
 
+/** Off means a FIXED model: no prompt routing AND no equivalent-model failover. */
+function stateLabel(enabled: boolean): string {
+  return enabled ? "routing: on (this session)" : "routing: off (this session) — model fixed, no failover";
+}
+
 const USAGE = "Usage: /route [status|on|off|why|history [n]|save|on save|off save]";
 
 function isRealDecision(decision: RouteDecision | { note: string } | null): decision is RouteDecision {
@@ -92,7 +97,7 @@ export async function runRouteSlash(input: string, ctx: RouteSlashCtx): Promise<
   const effective = ctx.sessionRouteOverride ?? ctx.routingConfigEnabled;
 
   if (!sub || sub === "status") {
-    const lines = [`routing: ${effective ? "on" : "off"} (this session)`];
+    const lines = [stateLabel(effective)];
     if (isRealDecision(ctx.lastRouteDecision)) {
       lines.push(`last decision: ${ctx.lastRouteDecision.tier} → ${ctx.lastRouteDecision.model} (${ctx.lastRouteDecision.source}: ${ctx.lastRouteDecision.signals.join(", ") || "none"}, confidence ${ctx.lastRouteDecision.confidence.toFixed(2)})`);
     }
@@ -113,9 +118,9 @@ export async function runRouteSlash(input: string, ctx: RouteSlashCtx): Promise<
     const enabled = sub === "on";
     if (arg === "save") {
       await saveConfigPatch(raw => ({ routing: { ...raw.routing, enabled } }));
-      return { sessionRouteOverride: enabled, lines: [`routing: ${enabled ? "on" : "off"} (this session) — saved to ~/.jeo/config.json`] };
+      return { sessionRouteOverride: enabled, lines: [`${stateLabel(enabled)} — saved to ~/.jeo/config.json`] };
     }
-    return { sessionRouteOverride: enabled, lines: [`routing: ${enabled ? "on" : "off"} (this session)`] };
+    return { sessionRouteOverride: enabled, lines: [stateLabel(enabled)] };
   }
 
   // Bare `/route save` persists whatever is CURRENTLY effective (a prior