@chrysb/alphaclaw 0.9.29 → 0.9.31

package/lib/public/js/components/gateway.js

@@ -36,6 +36,8 @@ export const Gateway = ({
     watchdogStatus?.lifecycle === "crash_loop"
       ? "crash_loop"
       : watchdogStatus?.health;
+  const hasConfigurationError =
+    watchdogStatus?.lifecycle === "configuration_error";
   const watchdogDotClass =
     watchdogHealth === "healthy"
       ? "ac-status-dot ac-status-dot--healthy ac-status-dot--healthy-offset"
@@ -44,8 +46,11 @@ export const Gateway = ({
         : watchdogHealth === "unhealthy" || watchdogHealth === "crash_loop"
           ? "bg-red-500"
           : "bg-gray-500";
-  const watchdogLabel =
-    watchdogHealth === "unknown" ? "initializing" : watchdogHealth || "unknown";
+  const watchdogLabel = hasConfigurationError
+    ? "configuration error"
+    : watchdogHealth === "unknown"
+      ? "initializing"
+      : watchdogHealth || "unknown";
   const isRepairInProgress = repairing || !!watchdogStatus?.operationInProgress;
   const showInspectButton = watchdogHealth === "degraded" && !!onOpenWatchdog;
   const showRepairButton =

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

@@ -4,6 +4,7 @@ import htm from "htm";
 import {
   getModelProvider,
   getAuthProviderFromModelProvider,
+  getFriendlyModelLabel,
   kProviderLabels,
   kProviderOrder,
 } from "../../lib/model-config.js";
@@ -79,11 +80,13 @@ export const buildSyntheticModelEntry = (modelKey) => {
   return {
     key,
     provider,
-    label: anthropicLabel || key,
+    label: anthropicLabel || getFriendlyModelLabel(key),
   };
 };
 
-export const getModelDisplayLabel = (model) => model?.featuredLabel || model?.label || model?.key;
+export const getModelDisplayLabel = (model) =>
+  model?.featuredLabel ||
+  getFriendlyModelLabel(model?.key, model?.label || model?.key);
 
 const buildModelSearchText = (model) =>
   [

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

@@ -16,6 +16,7 @@ import {
   kModelCatalogCacheKey,
   kModelCatalogPollIntervalMs,
 } from "../../lib/model-catalog.js";
+import { withAlwaysAvailableModels } from "../../lib/model-config.js";
 
 let kModelsTabCache = null;
 const getCredentialValue = (value) =>
@@ -199,7 +200,9 @@ export const useModels = (agentId) => {
   const addModel = useCallback(
     (modelKey) => {
       if (!modelKey) return;
-      const catalogEntry = catalog.find((model) => model?.key === modelKey);
+      const catalogEntry = withAlwaysAvailableModels(catalog).find(
+        (model) => model?.key === modelKey,
+      );
       const modelConfig = catalogEntry?.agentRuntime
         ? { agentRuntime: catalogEntry.agentRuntime }
         : {};

package/lib/public/js/components/nodes-tab/setup-wizard/index.js

@@ -100,7 +100,9 @@ export const NodesSetupWizard = ({
                 onCopy: () =>
                   copyAndToast("npm install -g openclaw", "command"),
               })}
-              <div class="text-xs text-fg-muted">Requires Node.js 22+.</div>
+              <div class="text-xs text-fg-muted">
+                Requires Node.js ${">=22.22.3 <23, >=24.15.0 <25, or >=25.9.0."}
+              </div>
             `
           : null
       }

package/lib/public/js/components/welcome/use-welcome.js

@@ -16,6 +16,7 @@ import {
   isDeprecatedOnboardingModelKey,
   getVisibleAiFieldKeys,
   kProviderAuthFields,
+  withAlwaysAvailableModels,
 } from "../../lib/model-config.js";
 import {
   getInitialOnboardingModelKey,
@@ -169,7 +170,9 @@ export const useWelcome = ({ onComplete }) => {
   };
 
   const applyModelCatalog = useCallback((payload) => {
-    const list = getOnboardingModels(getModelCatalogModels(payload));
+    const list = getOnboardingModels(
+      withAlwaysAvailableModels(getModelCatalogModels(payload)),
+    );
     if (!payload) return;
     const isRefreshing = isModelCatalogRefreshing(payload);
     const isFallbackRefresh =

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

@@ -25,6 +25,10 @@ export const kFeaturedModelDefs = [
     label: "Sonnet 4.6",
     preferredKeys: ["anthropic/claude-sonnet-4-6"],
   },
+  {
+    label: "GPT-5.6 Sol",
+    preferredKeys: ["openai/gpt-5.6-sol", "openai-codex/gpt-5.6-sol"],
+  },
   {
     label: "GPT-5.5",
     preferredKeys: ["openai/gpt-5.5", "openai-codex/gpt-5.5"],
@@ -42,7 +46,22 @@ const kDeprecatedOnboardingModelKeys = new Set([
 const kCanonicalCodexOauthModelKeys = new Set([
   "openai/gpt-5.4-mini",
   "openai/gpt-5.5",
+  "openai/gpt-5.6-sol",
+  "openai/gpt-5.6-terra",
+  "openai/gpt-5.6-luna",
 ]);
+const kFriendlyModelLabels = {
+  "openai/gpt-5.4-mini": "GPT-5.4 Mini",
+  "openai/gpt-5.5": "GPT-5.5",
+  "openai/gpt-5.6-sol": "GPT-5.6 Sol",
+  "openai/gpt-5.6-terra": "GPT-5.6 Terra",
+  "openai/gpt-5.6-luna": "GPT-5.6 Luna",
+};
+
+export const getFriendlyModelLabel = (modelKey, fallback = "") => {
+  const normalizedKey = String(modelKey || "").trim();
+  return kFriendlyModelLabels[normalizedKey] || fallback || normalizedKey;
+};
 
 export const isDeprecatedOnboardingModelKey = (modelKey) =>
   kDeprecatedOnboardingModelKeys.has(String(modelKey || "").trim());
@@ -66,6 +85,24 @@ export const getOnboardingModelProvider = ({ modelKey, models = [] } = {}) => {
 };
 
 export const kAlwaysAvailableModelDefs = [
+  {
+    key: "openai/gpt-5.6-sol",
+    provider: "openai",
+    label: "GPT-5.6 Sol",
+    agentRuntime: { id: "codex" },
+  },
+  {
+    key: "openai/gpt-5.6-terra",
+    provider: "openai",
+    label: "GPT-5.6 Terra",
+    agentRuntime: { id: "codex" },
+  },
+  {
+    key: "openai/gpt-5.6-luna",
+    provider: "openai",
+    label: "GPT-5.6 Luna",
+    agentRuntime: { id: "codex" },
+  },
   {
     key: "openai/gpt-5.4-mini",
     provider: "openai",
@@ -82,9 +119,19 @@ export const kAlwaysAvailableModelDefs = [
 
 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);
+    const existingIndex = merged.findIndex((candidate) => candidate?.key === model.key);
+    if (existingIndex < 0) {
+      merged.push(model);
+      continue;
+    }
+    const existing = merged[existingIndex];
+    merged[existingIndex] = {
+      ...model,
+      ...existing,
+      label: getFriendlyModelLabel(model.key, existing?.label || model.label),
+      agentRuntime: existing?.agentRuntime || model.agentRuntime,
+    };
   }
   return merged;
 };

package/lib/public/js/lib/thinking-levels.js

@@ -8,6 +8,7 @@ const kThinkingLevelLabelOverrides = {
   adaptive: "Adaptive",
   xhigh: "Extra high",
   max: "Maximum",
+  ultra: "Ultra",
 };
 
 export const formatThinkingLevelLabel = (levelId = "") => {

package/lib/server/agents/shared.js

@@ -3,6 +3,7 @@ const {
   readOpenclawConfig,
   writeOpenclawConfig,
 } = require("../openclaw-config");
+const { ensureCodexRuntimePlugin } = require("../codex-runtime-config");
 
 const kDefaultAgentId = "main";
 const kAgentIdPattern = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
@@ -105,6 +106,7 @@ const loadConfig = ({ fsImpl, OPENCLAW_DIR }) =>
   });
 
 const saveConfig = ({ fsImpl, OPENCLAW_DIR, config }) => {
+  ensureCodexRuntimePlugin(config);
   writeOpenclawConfig({
     fsModule: fsImpl,
     openclawDir: OPENCLAW_DIR,

package/lib/server/auth-profiles.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const { DatabaseSync } = require("node:sqlite");
 const { AUTH_PROFILES_PATH, CODEX_PROFILE_ID, OPENCLAW_DIR } = require("./constants");
+const { ensureCodexRuntimePlugin } = require("./codex-runtime-config");
 
 const kDefaultAgentId = "main";
 const kApiKeyEnvVarByProvider = {
@@ -368,8 +369,13 @@ const createAuthProfiles = () => {
     const cfg = loadOpenclawConfig();
     const defaults = cfg.agents?.defaults || {};
     const configuredModels = preserveCodexRuntimeModels(defaults.models || {});
-    if (JSON.stringify(configuredModels) !== JSON.stringify(defaults.models || {})) {
+    const modelsChanged =
+      JSON.stringify(configuredModels) !== JSON.stringify(defaults.models || {});
+    if (modelsChanged) {
       cfg.agents.defaults.models = configuredModels;
+    }
+    const pluginsChanged = ensureCodexRuntimePlugin(cfg);
+    if (modelsChanged || pluginsChanged) {
       saveOpenclawConfig(cfg);
     }
     return {
@@ -389,6 +395,7 @@ const createAuthProfiles = () => {
     if (configuredModels !== undefined) {
       cfg.agents.defaults.models = preserveCodexRuntimeModels(configuredModels);
     }
+    ensureCodexRuntimePlugin(cfg);
     saveOpenclawConfig(cfg);
   };
 

package/lib/server/codex-runtime-config.js

@@ -0,0 +1,51 @@
+const {
+  ensurePluginsShell,
+  ensurePluginAllowed,
+} = require("./plugin-config");
+
+const modelUsesCodexRuntime = (modelKey, modelConfig) => {
+  const runtimeId = String(modelConfig?.agentRuntime?.id || "").trim();
+  if (runtimeId === "codex") return true;
+  if (runtimeId === "openclaw") return false;
+  return String(modelKey || "").startsWith("openai/gpt-");
+};
+
+const configUsesCodexRuntime = (cfg = {}) => {
+  const scopes = [
+    cfg.agents?.defaults || {},
+    ...(Array.isArray(cfg.agents?.list) ? cfg.agents.list : []),
+  ];
+  return scopes.some((scope) => {
+    const configuredModels = scope.models || {};
+    if (
+      Object.entries(configuredModels).some(([modelKey, modelConfig]) =>
+        modelUsesCodexRuntime(modelKey, modelConfig),
+      )
+    ) {
+      return true;
+    }
+    const primary = String(scope.model?.primary || "").trim();
+    return (
+      !!primary && modelUsesCodexRuntime(primary, configuredModels[primary])
+    );
+  });
+};
+
+const ensureCodexRuntimePlugin = (cfg = {}) => {
+  if (!configUsesCodexRuntime(cfg)) return false;
+  const before = JSON.stringify(cfg.plugins || {});
+  ensurePluginsShell(cfg);
+  ensurePluginAllowed({ cfg, pluginKey: "codex" });
+  const existingEntry = cfg.plugins.entries.codex;
+  cfg.plugins.entries.codex = {
+    ...(existingEntry && typeof existingEntry === "object" ? existingEntry : {}),
+    enabled: true,
+  };
+  return JSON.stringify(cfg.plugins) !== before;
+};
+
+module.exports = {
+  configUsesCodexRuntime,
+  ensureCodexRuntimePlugin,
+  modelUsesCodexRuntime,
+};

package/lib/server/constants.js

@@ -172,6 +172,24 @@ const kMinimalFallbackOnboardingModels = [
     provider: "anthropic",
     label: "Claude Haiku 4.6",
   },
+  {
+    key: "openai/gpt-5.6-sol",
+    provider: "openai",
+    label: "GPT-5.6 Sol",
+    agentRuntime: { id: "codex" },
+  },
+  {
+    key: "openai/gpt-5.6-terra",
+    provider: "openai",
+    label: "GPT-5.6 Terra",
+    agentRuntime: { id: "codex" },
+  },
+  {
+    key: "openai/gpt-5.6-luna",
+    provider: "openai",
+    label: "GPT-5.6 Luna",
+    agentRuntime: { id: "codex" },
+  },
   {
     key: "openai/gpt-5.5",
     provider: "openai",

package/lib/server/cost-utils.js

@@ -48,6 +48,24 @@ const kGlobalModelPricing = {
   "claude-haiku-4-6": { input: 0.8, output: 4.0 },
   "gpt-5": { input: 1.25, output: 10.0 },
   "gpt-5.4": { input: 2.5, output: 10.0 },
+  "gpt-5.6-sol": {
+    input: 5.0,
+    output: 30.0,
+    cacheRead: 0.5,
+    cacheWrite: 6.25,
+  },
+  "gpt-5.6-terra": {
+    input: 2.5,
+    output: 15.0,
+    cacheRead: 0.25,
+    cacheWrite: 3.125,
+  },
+  "gpt-5.6-luna": {
+    input: 1.0,
+    output: 6.0,
+    cacheRead: 0.1,
+    cacheWrite: 1.25,
+  },
   "gpt-5.1-codex": { input: 2.5, output: 10.0 },
   "gpt-5.3-codex": { input: 2.5, output: 10.0 },
   "gpt-4.1": { input: 2.0, output: 8.0 },

package/lib/server/helpers.js

@@ -123,13 +123,29 @@ const normalizeOnboardingModels = (models) => {
     const provider = resolveModelProvider(key);
     if (!kOnboardingModelProviders.has(provider)) continue;
     if (!deduped.has(key)) {
+      const agentRuntime = isCodexRuntimeModel
+        ? { id: "codex" }
+        : model.agentRuntime;
       deduped.set(key, {
         key,
         provider,
         label: model.name || model.key,
-        ...(isCodexRuntimeModel
-          ? { agentRuntime: { id: "codex" } }
+        ...(typeof model.available === "boolean"
+          ? { available: model.available }
           : {}),
+        ...(typeof model.reasoning === "boolean"
+          ? { reasoning: model.reasoning }
+          : {}),
+        ...(Number.isFinite(model.contextWindow)
+          ? { contextWindow: model.contextWindow }
+          : {}),
+        ...(Number.isFinite(model.maxTokens)
+          ? { maxTokens: model.maxTokens }
+          : {}),
+        ...(model.compat && typeof model.compat === "object"
+          ? { compat: model.compat }
+          : {}),
+        ...(agentRuntime ? { agentRuntime } : {}),
       });
     }
   }

package/lib/server/init/register-server-routes.js

@@ -14,6 +14,7 @@ const { registerWebhookRoutes } = require("../routes/webhooks");
 const { registerWatchdogRoutes } = require("../routes/watchdog");
 const { registerUsageRoutes } = require("../routes/usage");
 const { registerGmailRoutes } = require("../routes/gmail");
+const { ensureWebhookMappingIds } = require("../webhooks");
 const { registerDoctorRoutes } = require("../routes/doctor");
 const { registerAgentRoutes } = require("../routes/agents");
 const { registerCronRoutes } = require("../routes/cron");
@@ -178,6 +179,7 @@ const registerServerRoutes = ({
     runOnboardedBootSequence({
       ensureManagedExecDefaults,
       ensureUsageTrackerPluginConfig,
+      ensureWebhookMappingIds: () => ensureWebhookMappingIds({ fs, constants }),
       doSyncPromptFiles,
       reloadEnv,
       syncChannelConfig,

package/lib/server/model-catalog-cache.js

@@ -3,7 +3,7 @@ const path = require("path");
 const { ALPHACLAW_DIR, kFallbackOnboardingModels } = require("./constants");
 const { getCommandOutputCandidates } = require("./utils/command-output");
 
-const kModelCatalogCacheVersion = 1;
+const kModelCatalogCacheVersion = 2;
 const kModelCatalogRefreshBackoffMs = 30 * 1000;
 const kModelCatalogLoadTimeoutMs = 120 * 1000;
 const kModelCatalogBootstrapSource = "bootstrap";
@@ -36,9 +36,9 @@ const normalizeCachedModels = ({
 } = {}) =>
   normalizeOnboardingModels(
     (Array.isArray(models) ? models : []).map((model) => ({
+      ...model,
       key: model?.key,
       name: model?.label || model?.name || model?.key,
-      ...(model?.agentRuntime ? { agentRuntime: model.agentRuntime } : {}),
     })),
   );
 

package/lib/server/onboarding/openclaw.js

@@ -5,6 +5,7 @@ const {
   ensureUsageTrackerPluginEntry,
 } = require("../usage-tracker-config");
 const { isOpenAiCompatApiEnabled } = require("../alphaclaw-config");
+const { ensureCodexRuntimePlugin } = require("../codex-runtime-config");
 
 const kDefaultToolsProfile = "full";
 const kBootstrapExtraFiles = [
@@ -248,6 +249,7 @@ const writeSanitizedOpenclawConfig = ({
     cfg,
     varMap,
   });
+  ensureCodexRuntimePlugin(cfg);
 
   let content = JSON.stringify(cfg, null, 2);
   const replacements = buildSecretReplacements(varMap, process.env);
@@ -357,6 +359,8 @@ const writeManagedImportOpenclawConfig = ({
     ensurePluginAllowed({ cfg, pluginKey: "whatsapp" });
   }
 
+  ensureCodexRuntimePlugin(cfg);
+
   fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2));
 };
 

package/lib/server/onboarding/validation.js

@@ -5,6 +5,9 @@ const kAnthropicApiKeyPrefix = "sk-ant-api";
 const kCanonicalCodexOauthModelKeys = new Set([
   "openai/gpt-5.4-mini",
   "openai/gpt-5.5",
+  "openai/gpt-5.6-sol",
+  "openai/gpt-5.6-terra",
+  "openai/gpt-5.6-luna",
 ]);
 
 const usesCodexOauth = (modelKey, provider) =>

package/lib/server/openclaw-codex-migration.js

@@ -3,14 +3,36 @@ const path = require("path");
 const { pathToFileURL } = require("url");
 const { DatabaseSync } = require("node:sqlite");
 
-const findOpenclawDistModule = (prefix) => {
+const findOpenclawDistModules = (prefix) => {
   const entryPath = require.resolve("openclaw");
   const distDir = path.dirname(entryPath);
-  const filename = fs
+  const filenames = fs
     .readdirSync(distDir)
-    .find((name) => name.startsWith(`${prefix}-`) && name.endsWith(".js"));
-  if (!filename) throw new Error(`OpenClaw migration module not found: ${prefix}`);
-  return path.join(distDir, filename);
+    .filter((name) => name.startsWith(`${prefix}-`) && name.endsWith(".js"));
+  if (filenames.length === 0) {
+    throw new Error(`OpenClaw migration module not found: ${prefix}`);
+  }
+  return filenames.map((filename) => path.join(distDir, filename));
+};
+
+const loadOpenclawMigrationApi = async ({ prefix, functionNames }) => {
+  const api = {};
+  for (const modulePath of findOpenclawDistModules(prefix)) {
+    const mod = await import(pathToFileURL(modulePath).href);
+    for (const candidate of Object.values(mod)) {
+      if (typeof candidate !== "function") continue;
+      if (functionNames.includes(candidate.name) && !api[candidate.name]) {
+        api[candidate.name] = candidate;
+      }
+    }
+  }
+  const missing = functionNames.filter((name) => typeof api[name] !== "function");
+  if (missing.length > 0) {
+    throw new Error(
+      `OpenClaw migration exports not found for ${prefix}: ${missing.join(", ")}`,
+    );
+  }
+  return api;
 };
 
 const writeConfig = (configPath, cfg) => {
@@ -73,33 +95,55 @@ const migrateLegacyCodexState = async ({
   }
 
   const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
-  const routeModule = await import(
-    pathToFileURL(findOpenclawDistModule("codex-route-warnings")).href
-  );
-  const authModule = await import(
-    pathToFileURL(findOpenclawDistModule("doctor-auth-flat-profiles")).href
-  );
+  const routeApi = await loadOpenclawMigrationApi({
+    prefix: "codex-route-warnings",
+    functionNames: [
+      "maybeRepairCodexRoutes",
+      "maybeRepairCodexSessionRoutes",
+    ],
+  });
+  const authApi = await loadOpenclawMigrationApi({
+    prefix: "doctor-auth-flat-profiles",
+    functionNames: [
+      "collectOpenAICodexAuthProfileStoreIdMap",
+      "maybeRepairOpenAICodexAuthConfig",
+      "maybeRepairOpenAICodexAuthProfileStores",
+      "maybeMigrateAuthProfileJsonStoresToSqlite",
+    ],
+  });
 
   const changes = [];
   const warnings = [];
-  const routeRepair = routeModule.r({ cfg, env, shouldRepair: true });
+  const routeRepair = routeApi.maybeRepairCodexRoutes({
+    cfg,
+    env,
+    shouldRepair: true,
+  });
   let nextCfg = routeRepair.cfg;
   changes.push(...routeRepair.changes);
   warnings.push(...routeRepair.warnings);
 
-  const profileIdMap = authModule.t({ cfg: nextCfg, env });
-  const configAuthRepair = authModule.a(nextCfg, { profileIdMap });
+  const profileIdMap = authApi.collectOpenAICodexAuthProfileStoreIdMap({
+    cfg: nextCfg,
+    env,
+  });
+  const configAuthRepair = authApi.maybeRepairOpenAICodexAuthConfig(nextCfg, {
+    profileIdMap,
+  });
   nextCfg = configAuthRepair.config;
   changes.push(...configAuthRepair.changes);
   warnings.push(...configAuthRepair.warnings);
 
   if (changes.length > 0) writeConfig(configPath, nextCfg);
 
-  const storeRepair = await authModule.o({ cfg: nextCfg, env });
+  const storeRepair = await authApi.maybeRepairOpenAICodexAuthProfileStores({
+    cfg: nextCfg,
+    env,
+  });
   changes.push(...storeRepair.changes);
   warnings.push(...storeRepair.warnings);
 
-  const sqliteMigration = await authModule.n({
+  const sqliteMigration = await authApi.maybeMigrateAuthProfileJsonStoresToSqlite({
     cfg: nextCfg,
     env,
     prompter: { confirmAutoFix: async () => true },
@@ -113,7 +157,7 @@ const migrateLegacyCodexState = async ({
     writeConfig(configPath, nextCfg);
   }
 
-  const sessionRepair = await routeModule.i({
+  const sessionRepair = await routeApi.maybeRepairCodexSessionRoutes({
     cfg: nextCfg,
     env,
     shouldRepair: true,

package/lib/server/openclaw-thinking.js

@@ -27,29 +27,28 @@ const loadThinkingModule = async () => {
   return thinkingModulePromise;
 };
 
-const isNormalizeThinkLevel = (candidate) => {
-  if (typeof candidate !== "function") return false;
-  try {
-    return (
-      candidate("off") === "off" &&
-      candidate("low") === "low" &&
-      candidate("high") === "high"
-    );
-  } catch {
-    return false;
+const normalizeThinkingLevel = (raw) => {
+  const key = String(raw || "").trim().toLowerCase();
+  if (!key) return null;
+  const collapsed = key.replace(/[\s_-]+/g, "");
+  if (collapsed === "adaptive" || collapsed === "auto") return "adaptive";
+  if (collapsed === "max") return "max";
+  if (collapsed === "ultra") return "ultra";
+  if (collapsed === "xhigh" || collapsed === "extrahigh") return "xhigh";
+  if (key === "off") return "off";
+  if (["on", "enable", "enabled"].includes(key)) return "low";
+  if (["min", "minimal"].includes(key)) return "minimal";
+  if (["low", "thinkhard", "think-hard", "think_hard"].includes(key)) {
+    return "low";
   }
-};
-
-const resolveNormalizeThinkLevel = (mod) => {
-  const candidates = [
-    mod.normalizeThinkLevel,
-    mod.f,
-    mod.p,
-    ...Object.values(mod),
-  ];
-  const match = candidates.find(isNormalizeThinkLevel);
-  if (!match) throw new Error("OpenClaw normalizeThinkLevel export not found");
-  return match;
+  if (["mid", "med", "medium", "thinkharder", "think-harder", "harder"].includes(key)) {
+    return "medium";
+  }
+  if (["high", "ultrathink", "thinkhardest", "highest"].includes(key)) {
+    return "high";
+  }
+  if (key === "think") return "minimal";
+  return null;
 };
 
 const splitModelKey = (modelKey = "") => {
@@ -80,13 +79,13 @@ const resolveThinkingApi = async () => {
   return {
     listThinkingLevelOptions: mod.listThinkingLevelOptions || mod.i,
     resolveThinkingDefaultForModel: mod.resolveThinkingDefaultForModel || mod.s,
-    normalizeThinkLevel: resolveNormalizeThinkLevel(mod),
   };
 };
 
 const resolveThinkingOptionsForModel = async ({
   modelKey = "",
   catalog = [],
+  agentRuntime = "",
 } = {}) => {
   const { provider, model } = splitModelKey(modelKey);
   if (!provider || !model) {
@@ -96,12 +95,20 @@ const resolveThinkingOptionsForModel = async ({
     };
   }
   const api = await resolveThinkingApi();
-  const levels = api.listThinkingLevelOptions(provider, model, catalog) || [];
+  const normalizedAgentRuntime = String(agentRuntime || "").trim() || undefined;
+  const levels =
+    api.listThinkingLevelOptions(
+      provider,
+      model,
+      catalog,
+      normalizedAgentRuntime,
+    ) || [];
   const modelDefault =
     api.resolveThinkingDefaultForModel({
       provider,
       model,
       catalog,
+      agentRuntime: normalizedAgentRuntime,
     }) || "off";
   return {
     levels: levels.map((entry) => ({
@@ -114,14 +121,13 @@ const resolveThinkingOptionsForModel = async ({
 
 const normalizeThinkingDefaultValue = async (raw) => {
   if (raw === null || raw === undefined || raw === "") return null;
-  const api = await resolveThinkingApi();
-  const normalized = api.normalizeThinkLevel(String(raw || "").trim());
-  return normalized || null;
+  return normalizeThinkingLevel(raw);
 };
 
 module.exports = {
   buildCatalogEntry,
   loadThinkingModule,
+  normalizeThinkingLevel,
   normalizeThinkingDefaultValue,
   resolveThinkingOptionsForModel,
   splitModelKey,