anygate 0.5.6 → 0.5.8

package/dist/cli.js

@@ -91,8 +91,8 @@ import {
   listCredentialSkippedProviders,
   loadPreferences,
   loadRegistry,
-  loadServerModels,
   localProviderToRegistry,
+  localProvidersToServerModels,
   logActiveModel,
   logConnected,
   logProxy,
@@ -170,7 +170,7 @@ import {
   validateCustomEndpointUrl,
   writeSecureLogLine,
   zenRegistryStub
-} from "./chunk-ZEO4BR64.js";
+} from "./chunk-APLGXZWQ.js";
 import {
   filterTemplates,
   getTemplateById,
@@ -3771,7 +3771,7 @@ function launchCodex(modelId, env, extraArgs) {
 // src/agents/codex/prompts.ts
 import pc5 from "picocolors";
 import * as p6 from "@clack/prompts";
-async function pickCodexProvider(providers, prefs, hasFavorites = false, initialProviderId) {
+async function pickCodexProvider(providers, prefs, hasFavorites = false, initialProviderId, agentLabel = "Codex") {
   if (providers.length === 0 && !hasFavorites) return null;
   const options = providers.map((lp) => providerSelectOption(lp));
   if (hasFavorites) {
@@ -3781,9 +3781,9 @@ async function pickCodexProvider(providers, prefs, hasFavorites = false, initial
       hint: `${prefs.favoriteModels?.length ?? 0} saved favorites`
     });
   }
-  const initial = initialProviderId && options.some((o) => o.value === initialProviderId) ? initialProviderId : prefs.lastCodexProvider && options.some((o) => o.value === prefs.lastCodexProvider) ? prefs.lastCodexProvider : options[0].value;
+  const initial = initialProviderId && options.some((o) => o.value === initialProviderId) ? initialProviderId : hasFavorites ? "__favorites__" : prefs.lastCodexProvider && options.some((o) => o.value === prefs.lastCodexProvider) ? prefs.lastCodexProvider : options[0].value;
   const chosen = await p6.select({
-    message: "Which provider for Codex?",
+    message: `Which provider for ${agentLabel}?`,
     options,
     initialValue: initial
   });
@@ -4006,6 +4006,14 @@ async function buildFavoritesList(starting, favorites, ctx, max = 20, options =
   }
   return { resolved: out, droppedFavorites, capacitySkippedFavorites };
 }
+function resolveFirstAvailableFavorite(favorites, providers) {
+  for (const fav of favorites) {
+    const provider = providers.find((lp) => lp.id === fav.providerId);
+    const model = provider?.models.find((m) => m.id === fav.modelId);
+    if (provider && model) return { provider, model };
+  }
+  return void 0;
+}
 
 // src/agents/codex/favorites-launch.ts
 var identityProvider = (provider) => provider;
@@ -5178,7 +5186,7 @@ function mapFinishReason(reason) {
   if (reason === "content-filter") return "SAFETY";
   return "OTHER";
 }
-function lookupGeminiRoute(routes, requestedModel) {
+function lookupGeminiRoute(routes, requestedModel, defaultRoute) {
   const ids = [requestedModel, ...routeLookupIds(requestedModel)];
   const slashIdx = requestedModel.indexOf("/");
   if (slashIdx >= 0) {
@@ -5195,7 +5203,11 @@ function lookupGeminiRoute(routes, requestedModel) {
     const route = routes.find((r) => r.aliasId === id || r.realModelId === id);
     if (route) return route;
   }
-  return void 0;
+  const fallback = defaultRoute ?? routes[0];
+  if (requestedModel !== fallback.aliasId) {
+    console.error(`[gemini-proxy] model '${requestedModel}' not in catalog \u2014 remapping to default route '${fallback.aliasId}' (upstream: ${fallback.realModelId})`);
+  }
+  return fallback;
 }
 function mergeConsecutiveMessages2(messages) {
   const merged = [];
@@ -8899,6 +8911,9 @@ function buildAgyLaunchArgs(modelLabel, childArgs) {
 function agyArgsAreNonInteractive(args) {
   return args.some((arg) => arg === "-p" || arg === "--prompt" || arg.startsWith("--prompt="));
 }
+function agyArgsIncludeFavoritesFlag(args) {
+  return args.includes("--favorites");
+}
 function formatAgyCapacityWarning(validatedSlotCount, skippedFavoriteCount) {
   const slotWord = validatedSlotCount === 1 ? "slot" : "slots";
   const favoritePhrase = skippedFavoriteCount === 1 ? "1 favorite was not exposed" : `${skippedFavoriteCount} favorites were not exposed`;
@@ -9101,8 +9116,34 @@ async function runAntigravityCommand(intro, tracePrefix, trace, boot, launch, op
     p11.log.info("Tip: AGY uses its own favorites list. Run `anygate favorites --agy` to set up switching.");
     savePreferences({ antigravityCliFavoritesHintShown: true });
   }
+  const agyFavorites = prefs.antigravityCliFavoriteModels ?? [];
+  if (opts.useFavoritesCatalog && agyFavorites.length > 0) {
+    const catalogSpinner = p11.spinner();
+    catalogSpinner.start("Loading providers...");
+    let catalog;
+    try {
+      catalog = await fetchProviderCatalog();
+    } catch (err) {
+      catalogSpinner.stop("");
+      p11.log.error(String(err instanceof Error ? err.message : err));
+      return 1;
+    }
+    catalogSpinner.stop("");
+    const allProviders = providersForTarget(providersForPicker(catalog), "antigravity");
+    const firstFavorite = resolveFirstAvailableFavorite(agyFavorites, allProviders);
+    if (!firstFavorite) {
+      p11.log.warn("No Antigravity CLI favorites are currently available.");
+      p11.log.info(pc9.dim("Manage them with `anygate favorites --agy`."));
+      return 1;
+    }
+    const selection2 = { provider: firstFavorite.provider, model: firstFavorite.model, allProviders };
+    return await launchWithSelection(selection2, prefs, opts, trace, tracePrefix, boot, launch);
+  }
   const selection = await resolveAntigravityLaunch(prefs, boot);
   if (!selection) return 1;
+  return await launchWithSelection(selection, prefs, opts, trace, tracePrefix, boot, launch);
+}
+async function launchWithSelection(selection, prefs, opts, trace, tracePrefix, boot, launch) {
   const { provider, model, allProviders } = selection;
   const versionResult = opts.versionGuard ? readAntigravityCliVersion() : { version: "1.0.10" };
   const compatibility = evaluateAgySwitchCompatibility({
@@ -9158,7 +9199,7 @@ async function runAgyCommand(childArgs, trace = false, boot) {
     trace,
     boot,
     (env, routes) => launchAntigravityCli(env, buildAgyLaunchArgs(routes[0].displayName, childArgs)),
-    { childArgs, versionGuard: true, pauseForCapacityWarning: true }
+    { childArgs, versionGuard: true, pauseForCapacityWarning: true, useFavoritesCatalog: agyArgsIncludeFavoritesFlag(childArgs) }
   );
 }
 async function runAntigravityAppCommand(childArgs, trace = false, boot) {
@@ -9206,7 +9247,7 @@ async function runAntigravityAppCommand(childArgs, trace = false, boot) {
       }
       return 0;
     },
-    { childArgs, versionGuard: false, pauseForCapacityWarning: false }
+    { childArgs, versionGuard: false, pauseForCapacityWarning: false, useFavoritesCatalog: agyArgsIncludeFavoritesFlag(childArgs) }
   );
 }
 async function runAntigravityIdeCommand(childArgs, trace = false, boot) {
@@ -9254,7 +9295,7 @@ async function runAntigravityIdeCommand(childArgs, trace = false, boot) {
       }
       return 0;
     },
-    { childArgs, versionGuard: false, pauseForCapacityWarning: false }
+    { childArgs, versionGuard: false, pauseForCapacityWarning: false, useFavoritesCatalog: agyArgsIncludeFavoritesFlag(childArgs) }
   );
 }
 
@@ -10028,6 +10069,7 @@ async function runCodexAppCommand(args, opts = {}) {
   const prefs = loadPreferences();
   const favorites = prefs.favoriteModels ?? [];
   const favoritesActive = favorites.length > 0;
+  const useFavoritesCatalog = args.includes("--favorites");
   if (favoritesActive && !configOnly) {
     p12.log.info(
       `Favorites mode active \u2014 Codex App picker will show ${favorites.length + 1} models (1 starting + ${favorites.length} favorites).`
@@ -10052,32 +10094,45 @@ async function runCodexAppCommand(args, opts = {}) {
     activeProvider = bootSelection.provider;
     selectedModel = bootSelection.model;
   } else if (!configOnly) {
-    let currentInitialProvider = prefs.lastCodexProvider && compatible.some((o) => o.id === prefs.lastCodexProvider) ? prefs.lastCodexProvider : compatible[0].id;
-    while (true) {
-      const pickedProvider = await pickCodexProvider(compatible, prefs, favoritesActive, currentInitialProvider);
-      if (!pickedProvider) return 0;
-      if (pickedProvider === "__favorites__") {
-        const favoritePick = await pickFavoriteStartingModel(
-          compatible,
-          favorites,
-          "codex-app",
-          "Codex App",
-          providerForCodexPicker
-        );
-        if (favoritePick === "cancelled" || favoritePick === "unavailable") return 0;
-        activeProvider = favoritePick.provider;
-        selectedModel = favoritePick.model;
-        break;
-      } else {
-        activeProvider = providerForCodexPicker(pickedProvider);
-        const pickedModelResult = await pickCodexModel(activeProvider, prefs);
-        if (pickedModelResult === "back") {
-          currentInitialProvider = activeProvider.id;
-          continue;
+    if (useFavoritesCatalog && favoritesActive) {
+      const firstFavorite = resolveFirstAvailableFavorite(
+        favorites,
+        compatible.map(providerForCodexPicker)
+      );
+      if (!firstFavorite) {
+        p12.log.warn("No saved favorites are currently available.");
+        return 0;
+      }
+      activeProvider = providerForCodexPicker(firstFavorite.provider);
+      selectedModel = firstFavorite.model;
+    } else {
+      let currentInitialProvider = prefs.lastCodexProvider && compatible.some((o) => o.id === prefs.lastCodexProvider) ? prefs.lastCodexProvider : compatible[0].id;
+      while (true) {
+        const pickedProvider = await pickCodexProvider(compatible, prefs, favoritesActive, currentInitialProvider);
+        if (!pickedProvider) return 0;
+        if (pickedProvider === "__favorites__") {
+          const favoritePick = await pickFavoriteStartingModel(
+            compatible,
+            favorites,
+            "codex-app",
+            "Codex App",
+            providerForCodexPicker
+          );
+          if (favoritePick === "cancelled" || favoritePick === "unavailable") return 0;
+          activeProvider = favoritePick.provider;
+          selectedModel = favoritePick.model;
+          break;
+        } else {
+          activeProvider = providerForCodexPicker(pickedProvider);
+          const pickedModelResult = await pickCodexModel(activeProvider, prefs);
+          if (pickedModelResult === "back") {
+            currentInitialProvider = activeProvider.id;
+            continue;
+          }
+          if (!pickedModelResult) return 0;
+          selectedModel = pickedModelResult;
+          break;
         }
-        if (!pickedModelResult) return 0;
-        selectedModel = pickedModelResult;
-        break;
       }
     }
   }
@@ -10106,7 +10161,7 @@ async function runCodexAppCommand(args, opts = {}) {
   }
   if (!configOnly) {
     const modelLabel = formatCodexModelLabel(selectedModel);
-    const confirmed = await confirmCodexLaunch(
+    const confirmed = useFavoritesCatalog || await confirmCodexLaunch(
       activeProvider.name,
       modelLabel,
       selectedModel.id,
@@ -10523,6 +10578,7 @@ async function runClaudeAppCommand(args, boot) {
     return 0;
   }
   const trace = args.includes("--trace");
+  const useFavoritesCatalog = args.includes("--favorites");
   const debugLogPath = trace ? getProxyDebugLogPath() : void 0;
   if (trace) console.log(`Debug log: ${debugLogPath}`);
   try {
@@ -10580,8 +10636,10 @@ async function runClaudeAppCommand(args, boot) {
     }
     activeProvider = bootSelection.provider;
     selectedModel = bootSelection.model;
+  } else if (useFavoritesCatalog && hasFavorites) {
+    useFavorites = true;
   } else {
-    const pickedProvider = await pickCodexProvider(compatible, prefs, hasFavorites);
+    const pickedProvider = await pickCodexProvider(compatible, prefs, hasFavorites, void 0, "Claude");
     if (!pickedProvider) return 0;
     if (pickedProvider === "__favorites__") {
       useFavorites = true;
@@ -10641,9 +10699,19 @@ async function runClaudeAppCommand(args, boot) {
         headers: void 0
       }));
     }
-    const allModels = await loadServerModels();
-    const regularServerModels = filterServerModelsByFavorites(allModels, regularFavorites);
+    const regularLocalProviders = providersForTarget(catalog, "claude-app");
+    const regularAllModels = regularLocalProviders.flatMap(
+      (provider) => localProvidersToServerModels([provider])
+    );
+    const regularServerModels = filterServerModelsByFavorites(regularAllModels, regularFavorites);
     serverModels = [...cloudCodeServerModels, ...regularServerModels];
+    const seen = /* @__PURE__ */ new Set();
+    serverModels = serverModels.filter((m) => {
+      const key = `${m.providerId}:${m.id}`;
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    });
   } else if (selectedModel.modelFormat === "cloud-code") {
     const providerData = activeProvider.providerData ?? {};
     const cloudRoute = buildCloudCodeProxyRoute(selectedModel, activeProvider.apiKey, providerData);
@@ -12874,7 +12942,7 @@ Error: ${parsed.error}
       console.log("Usage: anygate ui [--trace]\n\nOpen the settings UI in your browser.");
       return 0;
     }
-    const { runUiCommand } = await import("./command-PW7KW3PP.js");
+    const { runUiCommand } = await import("./command-O6JD4567.js");
     return runUiCommand({ trace: parsed.trace });
   }
   if (parsed.command === "models") {