@dexto/tui 1.6.11 → 1.6.13

package/dist/components/overlays/ModelSelectorRefactored.js

@@ -11,12 +11,16 @@ import {
 import { Box, Text } from "ink";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import {
+  CodexAppServerClient,
+  createCodexBaseURL,
   listOllamaModels,
   DEFAULT_OLLAMA_URL,
   getLocalModelById,
   getCuratedModelRefsForProviders,
+  getModelDisplayName,
   getOpenRouterModelCacheInfo,
   getReasoningProfile,
+  parseCodexBaseURL,
   refreshOpenRouterModelCache
 } from "@dexto/core";
 import {
@@ -48,9 +52,102 @@ const MODEL_SELECTOR_TABS = [
 ];
 const PROVIDER_COLLATOR = new Intl.Collator("en", { sensitivity: "base" });
 const PROVIDER_TOKEN_PATTERN = /[^a-z0-9]/g;
+const CODEX_CHATGPT_BASE_URL = createCodexBaseURL("chatgpt");
+const CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS = 5e3;
 function normalizeProviderToken(value) {
   return value.toLowerCase().replace(PROVIDER_TOKEN_PATTERN, "");
 }
+function isChatGPTCodexBaseURL(baseURL) {
+  return parseCodexBaseURL(baseURL)?.authMode === "chatgpt";
+}
+function isChatGPTCodexConfig(provider, baseURL) {
+  return provider === "openai-compatible" && isChatGPTCodexBaseURL(baseURL);
+}
+function canonicalizeModelBaseURL(baseURL) {
+  const parsed = parseCodexBaseURL(baseURL);
+  return parsed ? createCodexBaseURL(parsed.authMode) : baseURL;
+}
+function toCanonicalModelPickerKey(input) {
+  const baseURL = canonicalizeModelBaseURL(input.baseURL);
+  return toModelPickerKey({
+    provider: input.provider,
+    model: input.model,
+    ...baseURL ? { baseURL } : {}
+  });
+}
+function createModelIdentity(input) {
+  return {
+    provider: input.provider,
+    name: input.name,
+    ...input.baseURL ? { baseURL: input.baseURL } : {}
+  };
+}
+async function raceWithTimeout(promise, options) {
+  return await new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      options.onTimeout?.();
+      reject(new Error(options.errorMessage));
+    }, options.timeoutMs);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
+function matchesConfiguredModel(candidate, configured) {
+  if (candidate.provider !== configured.provider || candidate.name !== configured.model) {
+    return false;
+  }
+  const candidateBaseURL = candidate.baseURL ?? "";
+  const configuredBaseURL = configured.baseURL ?? "";
+  if (candidateBaseURL === configuredBaseURL) {
+    return true;
+  }
+  const candidateCodex = parseCodexBaseURL(candidate.baseURL);
+  const configuredCodex = parseCodexBaseURL(configured.baseURL);
+  return candidateCodex?.authMode === configuredCodex?.authMode;
+}
+async function loadChatGPTCodexModels(agent) {
+  let client = null;
+  try {
+    const createPromise = CodexAppServerClient.create({
+      requestTimeoutMs: CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS
+    });
+    client = await raceWithTimeout(createPromise, {
+      timeoutMs: CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS,
+      errorMessage: `Timed out starting ChatGPT Codex model listing after ${CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS}ms`,
+      onTimeout: () => {
+        void createPromise.then((lateClient) => lateClient.close().catch(() => void 0)).catch(() => void 0);
+      }
+    });
+    const account = await raceWithTimeout(client.readAccount(false), {
+      timeoutMs: CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS,
+      errorMessage: `Timed out reading ChatGPT Codex account state after ${CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS}ms`
+    });
+    if (account.account?.type !== "chatgpt") {
+      return [];
+    }
+    return await raceWithTimeout(client.listModels(), {
+      timeoutMs: CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS,
+      errorMessage: `Timed out listing ChatGPT Codex models after ${CHATGPT_CODEX_MODEL_LIST_TIMEOUT_MS}ms`
+    });
+  } catch (error) {
+    agent.logger.debug(
+      `ChatGPT Codex model list unavailable: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return [];
+  } finally {
+    if (client) {
+      await client.close().catch(() => void 0);
+    }
+  }
+}
 function toReleaseDateLookupKey(provider, modelName) {
   return `${provider}::${modelName.toLowerCase()}`;
 }
@@ -167,7 +264,11 @@ function compareModelOptionsForDisplay(left, right) {
   return 0;
 }
 function toModelIdentityKey(model) {
-  return toModelPickerKey({ provider: model.provider, model: model.name });
+  return toCanonicalModelPickerKey({
+    provider: model.provider,
+    model: model.name,
+    ...model.baseURL ? { baseURL: model.baseURL } : {}
+  });
 }
 function normalizeLineText(value) {
   return stripUnsafeCharacters(value).replace(/\r?\n/g, " ").replace(/\s+/g, " ").trim();
@@ -324,12 +425,20 @@ const ModelSelector = forwardRef(function ModelSelector2({
             `OpenRouter catalog refresh skipped: ${error instanceof Error ? error.message : String(error)}`
           );
         }
-        const [allModels, providers, currentConfig, loadedCustomModels, preferences] = await Promise.all([
+        const [
+          allModels,
+          providers,
+          currentConfig,
+          loadedCustomModels,
+          preferences,
+          codexModels
+        ] = await Promise.all([
           Promise.resolve(agent.getSupportedModels()),
           Promise.resolve(agent.getSupportedProviders()),
           Promise.resolve(agent.getCurrentLLMConfig()),
           loadCustomModels(),
-          loadGlobalPreferences().catch(() => null)
+          loadGlobalPreferences().catch(() => null),
+          loadChatGPTCodexModels(agent)
         ]);
         const pickerState = await loadModelPickerState().catch(() => null);
         const modelList = [];
@@ -338,6 +447,51 @@ const ModelSelector = forwardRef(function ModelSelector2({
         const defaultBaseURL = preferences?.llm.baseURL;
         const defaultReasoningVariant = preferences?.llm.reasoning?.variant;
         const resolveReleaseDate = createReleaseDateResolver({ allModels, providers });
+        const defaultConfig = defaultProvider && defaultModel ? {
+          provider: defaultProvider,
+          model: defaultModel,
+          ...defaultBaseURL ? { baseURL: defaultBaseURL } : {}
+        } : null;
+        const currentModelConfig = {
+          provider: currentConfig.provider,
+          model: currentConfig.model,
+          ...currentConfig.baseURL ? { baseURL: currentConfig.baseURL } : {}
+        };
+        const getMatchState = (candidate) => ({
+          isDefault: defaultConfig ? matchesConfiguredModel(candidate, defaultConfig) : false,
+          isCurrent: matchesConfiguredModel(candidate, currentModelConfig)
+        });
+        const addChatGPTCodexModel = (input) => {
+          const existing = modelList.find(
+            (candidate) => candidate.provider === "openai-compatible" && candidate.name === input.model && candidate.baseURL === CODEX_CHATGPT_BASE_URL
+          );
+          if (existing) {
+            existing.isDefault = existing.isDefault || input.isDefault;
+            existing.isCurrent = existing.isCurrent || input.isCurrent;
+            if (existing.displayName === void 0 && input.displayName !== void 0) {
+              existing.displayName = input.displayName;
+            }
+            if (existing.releaseDate === void 0 && input.releaseDate !== void 0) {
+              existing.releaseDate = input.releaseDate;
+            }
+            if (existing.reasoningVariant === void 0 && input.reasoningVariant !== void 0) {
+              existing.reasoningVariant = input.reasoningVariant;
+            }
+            return;
+          }
+          modelList.push({
+            provider: "openai-compatible",
+            name: input.model,
+            displayName: input.displayName,
+            maxInputTokens: 128e3,
+            isDefault: input.isDefault,
+            isCurrent: input.isCurrent,
+            isCustom: false,
+            baseURL: CODEX_CHATGPT_BASE_URL,
+            ...input.releaseDate !== void 0 ? { releaseDate: input.releaseDate } : {},
+            ...input.reasoningVariant !== void 0 ? { reasoningVariant: input.reasoningVariant } : {}
+          });
+        };
         let ollamaModels = [];
         let localModels = [];
         try {
@@ -352,13 +506,19 @@ const ModelSelector = forwardRef(function ModelSelector2({
         }
         for (const custom of loadedCustomModels) {
           const customProvider = custom.provider;
+          const candidate = createModelIdentity({
+            provider: customProvider,
+            name: custom.name,
+            baseURL: custom.baseURL
+          });
+          const { isDefault, isCurrent } = getMatchState(candidate);
           const modelOption = {
             provider: customProvider,
             name: custom.name,
             displayName: custom.displayName || custom.name,
             maxInputTokens: custom.maxInputTokens ?? 128e3,
-            isDefault: customProvider === defaultProvider && custom.name === defaultModel,
-            isCurrent: currentConfig.provider === customProvider && currentConfig.model === custom.name,
+            isDefault,
+            isCurrent,
             isCustom: true
           };
           if (custom.baseURL) {
@@ -389,32 +549,95 @@ const ModelSelector = forwardRef(function ModelSelector2({
               model.releaseDate
             );
             const originalProvider = "originalProvider" in model ? model.originalProvider : void 0;
+            const candidate = createModelIdentity({
+              provider,
+              name: model.name
+            });
+            const { isDefault, isCurrent } = getMatchState(candidate);
             modelList.push({
               provider,
               name: model.name,
               displayName: model.displayName,
               maxInputTokens: model.maxInputTokens,
-              isDefault: provider === defaultProvider && model.name === defaultModel,
-              isCurrent: provider === currentConfig.provider && model.name === currentConfig.model,
+              isDefault,
+              isCurrent,
               isCustom: false,
               ...releaseDate !== void 0 ? { releaseDate } : {},
               ...model.status !== void 0 ? { status: model.status } : {},
-              ...defaultReasoningVariant && provider === defaultProvider && model.name === defaultModel ? { reasoningVariant: defaultReasoningVariant } : {},
-              ...defaultBaseURL && provider === defaultProvider && model.name === defaultModel ? { baseURL: defaultBaseURL } : {},
+              ...defaultReasoningVariant && isDefault ? { reasoningVariant: defaultReasoningVariant } : {},
               // Store original provider for display purposes
               ...originalProvider && { originalProvider }
             });
           }
         }
+        for (const codexModel of codexModels) {
+          const candidate = {
+            provider: "openai-compatible",
+            name: codexModel.model,
+            baseURL: CODEX_CHATGPT_BASE_URL
+          };
+          const isDefault = defaultConfig ? matchesConfiguredModel(candidate, defaultConfig) : false;
+          const releaseDate = resolveReleaseDate("openai", codexModel.model) ?? resolveReleaseDate("openrouter", codexModel.model);
+          addChatGPTCodexModel({
+            model: codexModel.model,
+            displayName: codexModel.displayName,
+            isDefault,
+            isCurrent: matchesConfiguredModel(candidate, currentModelConfig),
+            ...releaseDate !== void 0 ? { releaseDate } : {},
+            ...isDefault && defaultReasoningVariant ? { reasoningVariant: defaultReasoningVariant } : {}
+          });
+        }
+        const addMissingConfiguredCodexModel = (configured) => {
+          if (!configured || !isChatGPTCodexConfig(configured.provider, configured.baseURL)) {
+            return;
+          }
+          const releaseDate = resolveReleaseDate("openai", configured.model) ?? resolveReleaseDate("openrouter", configured.model);
+          addChatGPTCodexModel({
+            model: configured.model,
+            displayName: getModelDisplayName(configured.model, "openai"),
+            isDefault: defaultConfig ? matchesConfiguredModel(
+              {
+                provider: "openai-compatible",
+                name: configured.model,
+                baseURL: CODEX_CHATGPT_BASE_URL
+              },
+              defaultConfig
+            ) : false,
+            isCurrent: matchesConfiguredModel(
+              {
+                provider: "openai-compatible",
+                name: configured.model,
+                baseURL: CODEX_CHATGPT_BASE_URL
+              },
+              currentModelConfig
+            ),
+            ...releaseDate !== void 0 ? { releaseDate } : {},
+            ...defaultConfig && defaultReasoningVariant && matchesConfiguredModel(
+              {
+                provider: "openai-compatible",
+                name: configured.model,
+                baseURL: CODEX_CHATGPT_BASE_URL
+              },
+              defaultConfig
+            ) ? { reasoningVariant: defaultReasoningVariant } : {}
+          });
+        };
+        addMissingConfiguredCodexModel(defaultConfig);
+        addMissingConfiguredCodexModel(currentModelConfig);
         for (const ollamaModel of ollamaModels) {
+          const candidate = createModelIdentity({
+            provider: "ollama",
+            name: ollamaModel.name
+          });
+          const { isDefault, isCurrent } = getMatchState(candidate);
           modelList.push({
             provider: "ollama",
             name: ollamaModel.name,
             displayName: ollamaModel.name,
             maxInputTokens: 128e3,
             // Default, actual varies by model
-            isDefault: defaultProvider === "ollama" && defaultModel === ollamaModel.name,
-            isCurrent: currentConfig.provider === "ollama" && currentConfig.model === ollamaModel.name,
+            isDefault,
+            isCurrent,
             isCustom: false
           });
         }
@@ -422,13 +645,18 @@ const ModelSelector = forwardRef(function ModelSelector2({
           const modelInfo = getLocalModelById(localModel.id);
           const displayName = modelInfo?.name || localModel.id;
           const maxInputTokens = modelInfo?.contextLength || 128e3;
+          const candidate = createModelIdentity({
+            provider: "local",
+            name: localModel.id
+          });
+          const { isDefault, isCurrent } = getMatchState(candidate);
           modelList.push({
             provider: "local",
             name: localModel.id,
             displayName,
             maxInputTokens,
-            isDefault: defaultProvider === "local" && defaultModel === localModel.id,
-            isCurrent: currentConfig.provider === "local" && currentConfig.model === localModel.id,
+            isDefault,
+            isCurrent,
             isCustom: false
           });
         }
@@ -443,17 +671,22 @@ const ModelSelector = forwardRef(function ModelSelector2({
               model.name,
               model.releaseDate
             );
+            const candidate = createModelIdentity({
+              provider: "vertex",
+              name: model.name
+            });
+            const { isDefault, isCurrent } = getMatchState(candidate);
             modelList.push({
               provider: "vertex",
               name: model.name,
               displayName: model.displayName,
               maxInputTokens: model.maxInputTokens,
-              isDefault: defaultProvider === "vertex" && defaultModel === model.name,
-              isCurrent: currentConfig.provider === "vertex" && currentConfig.model === model.name,
+              isDefault,
+              isCurrent,
               isCustom: false,
               ...releaseDate !== void 0 ? { releaseDate } : {},
               ...model.status !== void 0 ? { status: model.status } : {},
-              ...defaultReasoningVariant && defaultProvider === "vertex" && defaultModel === model.name ? { reasoningVariant: defaultReasoningVariant } : {}
+              ...defaultReasoningVariant && isDefault ? { reasoningVariant: defaultReasoningVariant } : {}
             });
           }
         }
@@ -541,12 +774,7 @@ const ModelSelector = forwardRef(function ModelSelector2({
   }, [isVisible, agent, refreshVersion]);
   const favoriteKeySet = useMemo(
     () => new Set(
-      (modelPickerState?.favorites ?? []).map(
-        (entry) => toModelPickerKey({
-          provider: entry.provider,
-          model: entry.model
-        })
-      )
+      (modelPickerState?.favorites ?? []).map((entry) => toCanonicalModelPickerKey(entry))
     ),
     [modelPickerState]
   );
@@ -559,7 +787,8 @@ const ModelSelector = forwardRef(function ModelSelector2({
       const name = model.name.toLowerCase().replace(/[\s-]+/g, "");
       const displayName = (model.displayName || "").toLowerCase().replace(/[\s-]+/g, "");
       const provider = model.provider.toLowerCase().replace(/[\s-]+/g, "");
-      return name.includes(query) || displayName.includes(query) || provider.includes(query);
+      const providerDisplay = getLLMProviderDisplayName(model.provider, model.baseURL).toLowerCase().replace(/[\s-]+/g, "");
+      return name.includes(query) || displayName.includes(query) || provider.includes(query) || providerDisplay.includes(query);
     },
     [searchQuery]
   );
@@ -568,10 +797,7 @@ const ModelSelector = forwardRef(function ModelSelector2({
     const hasSearchQuery = searchQuery.trim().length > 0;
     const allCandidates = [...models].sort(compareModelOptionsForDisplay);
     const modelsByKey = new Map(
-      allCandidates.map((model) => [
-        toModelPickerKey({ provider: model.provider, model: model.name }),
-        model
-      ])
+      allCandidates.map((model) => [toModelIdentityKey(model), model])
     );
     const toUniqueMatchingModels = (candidates, limit) => {
       const deduped = [];
@@ -580,10 +806,7 @@ const ModelSelector = forwardRef(function ModelSelector2({
         if (!candidate || !matchesSearch(candidate)) {
           continue;
         }
-        const key = toModelPickerKey({
-          provider: candidate.provider,
-          model: candidate.name
-        });
+        const key = toModelIdentityKey(candidate);
         if (seen.has(key)) {
           continue;
         }
@@ -601,12 +824,12 @@ const ModelSelector = forwardRef(function ModelSelector2({
     const featuredCandidates = getCuratedModelRefsForProviders({
       providers: providersInModels,
       max: FEATURED_SECTION_LIMIT
-    }).map((ref2) => modelsByKey.get(toModelPickerKey(ref2)));
+    }).map((ref2) => modelsByKey.get(toCanonicalModelPickerKey(ref2)));
     const recentsFromState = (modelPickerState?.recents ?? []).map(
-      (entry) => modelsByKey.get(toModelPickerKey({ provider: entry.provider, model: entry.model }))
+      (entry) => modelsByKey.get(toCanonicalModelPickerKey(entry))
     );
     const favoritesFromState = (modelPickerState?.favorites ?? []).map(
-      (entry) => modelsByKey.get(toModelPickerKey({ provider: entry.provider, model: entry.model }))
+      (entry) => modelsByKey.get(toCanonicalModelPickerKey(entry))
     );
     const customCandidates = allCandidates.filter((model) => model.isCustom);
     const tabModels = hasSearchQuery ? toUniqueMatchingModels(allCandidates) : activeTab === "all-models" ? toUniqueMatchingModels(allCandidates) : activeTab === "featured" ? toUniqueMatchingModels(featuredCandidates) : activeTab === "recents" ? toUniqueMatchingModels(recentsFromState) : activeTab === "favorites" ? toUniqueMatchingModels(favoritesFromState) : toUniqueMatchingModels(customCandidates);
@@ -659,9 +882,11 @@ const ModelSelector = forwardRef(function ModelSelector2({
   const handleToggleFavoriteModel = useCallback(
     async (model) => {
       try {
+        const baseURL = canonicalizeModelBaseURL(model.baseURL);
         await toggleFavoriteModel({
           provider: model.provider,
-          model: model.name
+          model: model.name,
+          ...baseURL ? { baseURL } : {}
         });
         const nextState = await loadModelPickerState();
         setModelPickerState(nextState);
@@ -1149,12 +1374,16 @@ const ModelSelector = forwardRef(function ModelSelector2({
         }
         const actualIndex = modelStartIndex + scrollOffset + rowIndex;
         const isSelected = actualIndex === selectedIndex;
-        const providerDisplay = getLLMProviderDisplayName(item.provider);
+        const providerDisplay = getLLMProviderDisplayName(
+          item.provider,
+          item.baseURL
+        );
         const name = item.displayName || item.name;
         const isFavorite = favoriteKeySet.has(
-          toModelPickerKey({
+          toCanonicalModelPickerKey({
             provider: item.provider,
-            model: item.name
+            model: item.name,
+            ...item.baseURL ? { baseURL: item.baseURL } : {}
           })
         );
         const prefix = getRowPrefix({

package/dist/components/overlays/ReasoningOverlay.cjs

@@ -215,7 +215,7 @@ const ReasoningOverlay = import_react.default.forwardRef(
       [budgetInput, handleMenuSelect, isVisible, menuItems, mode, onClose, selectedIndex]
     );
     if (!isVisible) return null;
-    const providerLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(provider);
+    const providerLabel = (0, import_llm_provider_display.getLLMProviderDisplayName)(provider, llmConfig.baseURL);
     const modelLabel = (0, import_core.getModelDisplayName)(model);
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
       import_ink.Box,

package/dist/components/overlays/ReasoningOverlay.js

@@ -189,7 +189,7 @@ const ReasoningOverlay = React.forwardRef(
       [budgetInput, handleMenuSelect, isVisible, menuItems, mode, onClose, selectedIndex]
     );
     if (!isVisible) return null;
-    const providerLabel = getLLMProviderDisplayName(provider);
+    const providerLabel = getLLMProviderDisplayName(provider, llmConfig.baseURL);
     const modelLabel = getModelDisplayName(model);
     return /* @__PURE__ */ jsxs(
       Box,