@chrysb/alphaclaw 0.9.20 → 0.9.21

package/lib/public/js/components/models-tab/index.js

@@ -13,13 +13,15 @@ import {
   buildSyntheticModelEntry,
   getModelCatalogProvider,
   getModelsTabAuthProvider,
+  getModelsTabRequiredAuthProviders,
+  getProviderAuthDisplayOrder,
   getProviderSortIndex,
   SearchableModelPicker,
 } from "./model-picker.js";
 import { ProviderAuthCard } from "./provider-auth-card.js";
 import {
   getFeaturedModels,
-  kProviderOrder,
+  withAlwaysAvailableModels,
 } from "../../lib/model-config.js";
 
 const html = htm.bind(h);
@@ -27,19 +29,13 @@ const html = htm.bind(h);
 const deriveRequiredProviders = (configuredModels) => {
   const providers = new Set();
   for (const modelKey of Object.keys(configuredModels)) {
-    const provider = getModelsTabAuthProvider(modelKey);
-    if (provider) providers.add(provider);
+    for (const provider of getModelsTabRequiredAuthProviders(modelKey)) {
+      providers.add(provider);
+    }
   }
   return [...providers];
 };
 
-const kProviderDisplayOrder = [
-  "anthropic",
-  "openai",
-  "openai-codex",
-  ...kProviderOrder.filter((provider) => !["anthropic", "openai"].includes(provider)),
-];
-
 export const Models = ({ onRestartRequired = () => {}, agentId, embedded = false }) => {
   const {
     catalog,
@@ -70,14 +66,22 @@ export const Models = ({ onRestartRequired = () => {}, agentId, embedded = false
     [configuredModels],
   );
 
-  const featuredModels = useMemo(() => getFeaturedModels(catalog), [catalog]);
+  const selectableCatalog = useMemo(
+    () => withAlwaysAvailableModels(catalog),
+    [catalog],
+  );
+
+  const featuredModels = useMemo(
+    () => getFeaturedModels(selectableCatalog),
+    [selectableCatalog],
+  );
   const popularPickerModels = useMemo(
     () => featuredModels.filter((model) => !configuredKeys.has(model.key)),
     [featuredModels, configuredKeys],
   );
 
   const pickerModels = useMemo(() => {
-    return [...catalog]
+    return [...selectableCatalog]
       .filter((model) => !configuredKeys.has(model.key))
       .sort((a, b) => {
         const providerCompare =
@@ -86,7 +90,7 @@ export const Models = ({ onRestartRequired = () => {}, agentId, embedded = false
         if (providerCompare !== 0) return providerCompare;
         return String(a.label || a.key).localeCompare(String(b.label || b.key));
       });
-  }, [catalog, configuredKeys]);
+  }, [selectableCatalog, configuredKeys]);
 
   const requiredProviders = useMemo(
     () => deriveRequiredProviders(configuredModels),
@@ -94,14 +98,7 @@ export const Models = ({ onRestartRequired = () => {}, agentId, embedded = false
   );
 
   const sortedProviders = useMemo(() => {
-    const ordered = [];
-    for (const p of kProviderDisplayOrder) {
-      if (requiredProviders.includes(p)) ordered.push(p);
-    }
-    for (const p of requiredProviders) {
-      if (!ordered.includes(p)) ordered.push(p);
-    }
-    return ordered;
+    return getProviderAuthDisplayOrder(requiredProviders);
   }, [requiredProviders]);
 
   const providerHasAuth = useMemo(

package/lib/public/js/components/models-tab/model-picker.js

@@ -19,10 +19,30 @@ const kProviderDisplayOrder = [
 
 export const getModelsTabAuthProvider = (modelKey) => {
   const provider = getModelProvider(modelKey);
-  if (provider === "openai-codex") return "openai-codex";
+  if (provider === "openai" || provider === "openai-codex") {
+    return "openai-codex";
+  }
   return getAuthProviderFromModelProvider(provider);
 };
 
+export const getModelsTabRequiredAuthProviders = (modelKey) => {
+  const provider = getModelProvider(modelKey);
+  if (provider === "openai" || provider === "openai-codex") {
+    return ["openai", "openai-codex"];
+  }
+  const authProvider = getAuthProviderFromModelProvider(provider);
+  return authProvider ? [authProvider] : [];
+};
+
+export const getProviderAuthDisplayOrder = (requiredProviders = []) => {
+  const required = new Set(["openai-codex", ...requiredProviders]);
+  const ordered = kProviderDisplayOrder.filter((provider) => required.has(provider));
+  for (const provider of required) {
+    if (!ordered.includes(provider)) ordered.push(provider);
+  }
+  return ordered;
+};
+
 export const getModelCatalogProvider = (model) =>
   String(model?.provider || getModelProvider(model?.key)).trim();
 
@@ -88,6 +108,9 @@ export const buildProviderHasAuth = ({
   if (codexStatus?.connected) {
     result["openai-codex"] = true;
   }
+  if (result.openai) {
+    result["openai-codex"] = true;
+  }
   return result;
 };
 

package/lib/public/js/lib/model-config.js

@@ -27,11 +27,14 @@ export const kFeaturedModelDefs = [
   },
   {
     label: "Codex 5.3",
-    preferredKeys: ["openai-codex/gpt-5.3-codex"],
+    preferredKeys: [
+      "openai/gpt-5.3-codex",
+      "openai-codex/gpt-5.3-codex",
+    ],
   },
   {
     label: "GPT-5.5",
-    preferredKeys: ["openai-codex/gpt-5.5"],
+    preferredKeys: ["openai/gpt-5.5", "openai-codex/gpt-5.5"],
   },
   {
     label: "Gemini 3.1 Pro",
@@ -39,6 +42,23 @@ export const kFeaturedModelDefs = [
   },
 ];
 
+export const kAlwaysAvailableModelDefs = [
+  {
+    key: "openai/gpt-5.5",
+    provider: "openai",
+    label: "GPT-5.5",
+  },
+];
+
+export const withAlwaysAvailableModels = (models = []) => {
+  const merged = [...models];
+  const keys = new Set(merged.map((model) => model?.key));
+  for (const model of kAlwaysAvailableModelDefs) {
+    if (!keys.has(model.key)) merged.push(model);
+  }
+  return merged;
+};
+
 export const getFeaturedModels = (allModels) => {
   const picked = [];
   const used = new Set();

package/lib/server/constants.js

@@ -173,13 +173,13 @@ const kMinimalFallbackOnboardingModels = [
     label: "Claude Haiku 4.6",
   },
   {
-    key: "openai-codex/gpt-5.5",
-    provider: "openai-codex",
+    key: "openai/gpt-5.5",
+    provider: "openai",
     label: "GPT-5.5",
   },
   {
-    key: "openai-codex/gpt-5.3-codex",
-    provider: "openai-codex",
+    key: "openai/gpt-5.3-codex",
+    provider: "openai",
     label: "Codex GPT-5.3",
   },
   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "publishConfig": {
     "access": "public"
   },