ur-agent 1.27.4 → 1.27.5

package/dist/cli.js

@@ -52895,44 +52895,6 @@ async function listOllamaModelNames(signal) {
   setCachedOllamaModelNames(names);
   return names;
 }
-async function getOllamaModelOptions(signal) {
-  const names = await listOllamaModelNames(signal);
-  await Promise.allSettled(names.filter((name) => getOllamaContextLengthForModel(name) === undefined).map((name) => refreshOllamaModelMetadata(name, { timeoutMs: 500 })));
-  const { coder, fast } = categorizeOllamaModels(names);
-  const coderSet = new Set(coder);
-  const fastSet = new Set(fast);
-  return names.map((name) => ({
-    value: name,
-    label: name,
-    description: describeOllamaModel(name, coderSet, fastSet)
-  }));
-}
-function describeOllamaModel(name, coderSet, fastSet) {
-  const tags = [];
-  if (coderSet.has(name))
-    tags.push("coder");
-  else if (fastSet.has(name))
-    tags.push("fast");
-  const contextLength = getOllamaContextLengthForModel(name);
-  if (contextLength && contextLength > 0) {
-    tags.push(`${formatContextWindow(contextLength)} ctx`);
-  }
-  return tags.length > 0 ? `Installed \xB7 ${tags.join(" \xB7 ")}` : "Installed Ollama model";
-}
-function formatContextWindow(contextLength) {
-  return contextLength >= 1024 ? `${Math.round(contextLength / 1024)}K` : String(contextLength);
-}
-function mergeModelOptions(baseOptions, extraOptions) {
-  const result = [...baseOptions];
-  const seen = new Set(result.map((option) => option.value));
-  for (const option of extraOptions) {
-    if (!seen.has(option.value)) {
-      result.push(option);
-      seen.add(option.value);
-    }
-  }
-  return result;
-}
 async function refreshOllamaModelMetadata(model, options = {}) {
   const normalizedModel = model.trim();
   if (!normalizedModel) {
@@ -53510,27 +53472,37 @@ var init_model = __esm(() => {
 // src/services/providers/providerRegistry.ts
 var exports_providerRegistry = {};
 __export(exports_providerRegistry, {
+  validateProviderModelPair: () => validateProviderModelPair,
   validateProviderModelCompatibility: () => validateProviderModelCompatibility,
   setSafeProviderConfig: () => setSafeProviderConfig,
+  setProviderModel: () => setProviderModel,
   resolveProviderId: () => resolveProviderId,
   providerForAuthAlias: () => providerForAuthAlias,
   providerAliasesFor: () => providerAliasesFor,
   listProviders: () => listProviders,
+  listModelsForProviderWithSource: () => listModelsForProviderWithSource,
   listModelsForProvider: () => listModelsForProvider,
   launchProviderAuth: () => launchProviderAuth,
   isProviderId: () => isProviderId,
   isModelSupportedByProvider: () => isModelSupportedByProvider,
   getValidModelIdsForProvider: () => getValidModelIdsForProvider,
+  getProviderStatus: () => getProviderStatus,
   getProviderRuntimeInfo: () => getProviderRuntimeInfo,
   getProviderDefinition: () => getProviderDefinition,
+  getProviderAccessTypeLabel: () => getProviderAccessTypeLabel,
   getDefaultModelForProvider: () => getDefaultModelForProvider,
+  getConnectionStatusFromDoctorResult: () => getConnectionStatusFromDoctorResult,
   getActiveProviderSettings: () => getActiveProviderSettings,
+  formatProviderStatusLabel: () => formatProviderStatusLabel,
   formatProviderStatus: () => formatProviderStatus,
   formatProviderList: () => formatProviderList,
   formatProviderDoctor: () => formatProviderDoctor,
+  formatInvalidProviderModelMessage: () => formatInvalidProviderModelMessage,
   doctorProvider: () => doctorProvider,
   doctorActiveProvider: () => doctorActiveProvider,
+  credentialTypeLabel: () => credentialTypeLabel,
   classifyGeminiAccountSupport: () => classifyGeminiAccountSupport,
+  cacheProviderModelsForProvider: () => cacheProviderModelsForProvider,
   buildProviderAuthCommand: () => buildProviderAuthCommand,
   authModeLabel: () => authModeLabel,
   authAliasForProvider: () => authAliasForProvider,
@@ -53577,6 +53549,9 @@ function getProviderRuntimeInfo(settings = getInitialSettings()) {
   return {
     provider,
     providerLabel: definition.statusBarName,
+    accessType: definition.accessType,
+    accessTypeLabel: getProviderAccessTypeLabel(definition),
+    credentialType: definition.credentialType,
     authMode: definition.authMode,
     authLabel: authModeLabel(definition.authMode),
     model: providerSettings.model,
@@ -53598,6 +53573,21 @@ function authModeLabel(mode) {
       return "local";
   }
 }
+function getProviderAccessTypeLabel(provider) {
+  return provider.accessTypeLabel ?? provider.accessType;
+}
+function credentialTypeLabel(type) {
+  switch (type) {
+    case "cli-login":
+      return "subscription login";
+    case "api-key":
+      return "API key";
+    case "local-runtime":
+      return "local runtime";
+    case "openai-compatible-endpoint":
+      return "OpenAI-compatible endpoint";
+  }
+}
 function listProviders() {
   return PROVIDER_IDS.map((id) => PROVIDERS[id]);
 }
@@ -53637,6 +53627,7 @@ function setSafeProviderConfig(key, value) {
     };
   }
   let settings;
+  let providerModelInvalidated = false;
   try {
     if (key === "provider") {
       const provider = resolveProviderId(trimmed);
@@ -53646,7 +53637,22 @@ function setSafeProviderConfig(key, value) {
           message: `Unknown provider "${trimmed}". Run: ur provider list`
         };
       }
-      settings = { provider: { active: provider } };
+      const currentSettings = getInitialSettings();
+      const currentModel = getActiveProviderSettings(currentSettings).model;
+      const nextProviderSettings = { active: provider };
+      let invalidated = false;
+      if (currentModel) {
+        const validation = validateProviderModelPair(provider, currentModel);
+        if (validation.valid === false) {
+          nextProviderSettings.model = undefined;
+          invalidated = true;
+          providerModelInvalidated = true;
+        }
+      }
+      settings = {
+        provider: nextProviderSettings,
+        ...invalidated ? { model: undefined } : {}
+      };
     } else if (key === "provider.fallback") {
       const fallback = trimmed === "disabled" ? "disabled" : resolveProviderId(trimmed);
       if (!fallback) {
@@ -53661,13 +53667,11 @@ function setSafeProviderConfig(key, value) {
     } else if (key === "model") {
       const currentSettings = getInitialSettings();
       const currentProvider = getActiveProviderSettings(currentSettings).active ?? "ollama";
-      const validation = validateProviderModelCompatibility(currentProvider, trimmed);
+      const validation = validateProviderModelPair(currentProvider, trimmed);
       if (validation.valid === false) {
-        const validModelsStr = validation.validModels.join(", ") || "(uses dynamic discovery)";
-        const suggestedModel = validation.suggestedModel ?? "see provider docs";
         return {
           ok: false,
-          message: `${validation.error} Valid models for ${currentProvider}: ${validModelsStr}. Suggested: ${suggestedModel}`
+          message: validation.error
         };
       }
       settings = { provider: { model: trimmed }, model: trimmed };
@@ -53688,7 +53692,10 @@ function setSafeProviderConfig(key, value) {
     };
   }
   const savedValue = key === "provider" || key === "provider.fallback" ? key === "provider.fallback" && trimmed === "disabled" ? "disabled" : resolveProviderId(trimmed) ?? trimmed : trimmed;
-  return { ok: true, message: `Set ${key} to ${savedValue}.` };
+  return {
+    ok: true,
+    message: `Set ${key} to ${savedValue}.${providerModelInvalidated ? " Cleared incompatible model for the new provider; run /model to choose a scoped model." : ""}`
+  };
 }
 function outputText(result) {
   return `${result.stdout}
@@ -53749,7 +53756,7 @@ function isLocalBaseUrl(value) {
 async function checkEndpoint(definition, settings, adapters, result) {
   if (!definition.endpointKind)
     return;
-  const baseUrl = settings.baseUrl ?? definition.defaultBaseUrl;
+  const baseUrl = settings.baseUrl ?? (definition.id === "ollama" ? getOllamaBaseUrl() : definition.defaultBaseUrl);
   if (!baseUrl) {
     result.checks.push({
       name: "base_url",
@@ -53956,7 +53963,7 @@ async function doctorProvider(provider, options = {}) {
     await checkSubscriptionProvider(definition, settingsForProvider, options.adapters ?? {}, result);
   } else if (definition.accessType === "api") {
     await checkApiProvider(definition, settingsForProvider, options.adapters ?? {}, result);
-  } else {
+  } else if (definition.accessType === "local" || definition.accessType === "server") {
     await checkEndpoint(definition, settingsForProvider, options.adapters ?? {}, result);
   }
   result.fallback = fallbackResult(providerSettings, active, result.ok);
@@ -53967,6 +53974,67 @@ async function doctorActiveProvider(options = {}) {
   const active = getActiveProviderSettings(settings).active ?? "ollama";
   return doctorProvider(active, options);
 }
+function getConnectionStatusFromDoctorResult(result) {
+  if (result.ok) {
+    return "connected";
+  }
+  if (result.failureReason?.includes("CLI missing") || result.failureReason?.includes("not found")) {
+    return "missing";
+  }
+  if (result.failureReason?.includes("not logged in") || result.failureReason?.includes("not authenticated") || result.failureReason?.includes("API key missing") || result.failureReason?.includes("endpoint") || result.failureReason?.includes("HTTP")) {
+    return "unavailable";
+  }
+  return "unknown";
+}
+function formatProviderStatusLabel(status, provider, checks3) {
+  switch (status) {
+    case "connected":
+      if (provider.credentialType === "api-key" && provider.envKey) {
+        return `${provider.envKey} found`;
+      }
+      if (provider.id === "ollama") {
+        return "localhost reachable";
+      }
+      if (provider.credentialType === "openai-compatible-endpoint") {
+        return "OpenAI-compatible endpoint reachable";
+      }
+      if (provider.credentialType === "cli-login") {
+        return "subscription login connected";
+      }
+      return "connected";
+    case "missing":
+      if (provider.commandCandidates) {
+        return `CLI not found (tried: ${provider.commandCandidates.join(", ")})`;
+      }
+      return "missing";
+    case "unavailable": {
+      const failCheck = checks3.find((check3) => check3.status === "fail" || check3.status === "warn");
+      return failCheck?.message ?? "unavailable";
+    }
+    case "unknown":
+      return "status unknown";
+  }
+}
+async function getProviderStatus(providerId, options = {}) {
+  const provider = resolveProviderId(providerId);
+  if (!provider) {
+    throw new Error(`Unknown provider "${providerId}". Run: ur provider list`);
+  }
+  const definition = getProviderDefinition(provider);
+  const doctor = await doctorProvider(provider, options);
+  const status = getConnectionStatusFromDoctorResult(doctor);
+  return {
+    provider,
+    displayName: definition.displayName,
+    accessType: definition.accessType,
+    accessTypeLabel: getProviderAccessTypeLabel(definition),
+    credentialType: definition.credentialType,
+    status,
+    label: formatProviderStatusLabel(status, definition, doctor.checks),
+    checks: doctor.checks,
+    doctor
+  };
+}
 function authAliasForProvider(provider) {
   switch (provider) {
     case "codex-cli":
@@ -54074,16 +54142,20 @@ function formatProviderList(json2 = false) {
     name: provider.displayName,
     aliases: providerAliasesFor(provider.id),
     accessType: provider.accessType,
+    accessTypeLabel: getProviderAccessTypeLabel(provider),
+    credentialType: provider.credentialType,
+    modelDiscoveryType: provider.modelDiscoveryType,
     authMode: provider.authMode,
+    accessPath: provider.accessPathLabel,
     legalPath: provider.legalPath
   }));
   if (json2) {
     return JSON.stringify(providers, null, 2);
   }
   return [
-    "Provider | ID | Aliases | Access type | Legal path",
-    "--- | --- | --- | --- | ---",
-    ...providers.map((provider) => `${provider.name} | ${provider.id} | ${provider.aliases.slice(0, 3).join(", ") || "-"} | ${provider.accessType} | ${provider.legalPath}`)
+    "Provider | ID | Aliases | Access type | Credential | Model discovery | Access path",
+    "--- | --- | --- | --- | --- | --- | ---",
+    ...providers.map((provider) => `${provider.name} | ${provider.id} | ${provider.aliases.slice(0, 3).join(", ") || "-"} | ${provider.accessTypeLabel} | ${provider.credentialType} | ${provider.modelDiscoveryType} | ${provider.accessPath}`)
   ].join(`
 `);
 }
@@ -54093,6 +54165,8 @@ function formatProviderDoctor(result, json2 = false) {
   }
   const lines = [
     `Provider: ${result.displayName} (${result.provider})`,
+    `Access: ${getProviderAccessTypeLabel(getProviderDefinition(result.provider))}`,
+    `Credential: ${getProviderDefinition(result.provider).credentialType}`,
     `Auth: ${authModeLabel(result.authMode)}`,
     `Status: ${result.ok ? "ready" : "not ready"}`
   ];
@@ -54119,31 +54193,191 @@ function formatProviderStatus(result, json2 = false) {
 Failure reason: ${result.failureReason}` : "";
   const fix = result.suggestedFix ? `
 Suggested fix: ${result.suggestedFix}` : "";
+  const definition = getProviderDefinition(result.provider);
   return `Selected provider: ${result.displayName} (${result.provider})
+Access type: ${getProviderAccessTypeLabel(definition)}
+Credential: ${definition.credentialType}
 Auth mode: ${authModeLabel(result.authMode)}
 Ready: ${result.ok ? "yes" : "no"}${failure}${fix}`;
 }
-function listModelsForProvider(providerId) {
+function providerBaseUrl(provider, definition, settings) {
+  const providerSettings = getActiveProviderSettings(settings);
+  if (providerSettings.baseUrl) {
+    return providerSettings.baseUrl;
+  }
+  if (provider === "ollama") {
+    return getOllamaBaseUrl(process.env, settings);
+  }
+  return definition.defaultBaseUrl;
+}
+function parseOpenAICompatibleModelNames(value) {
+  if (!value || typeof value !== "object") {
+    return [];
+  }
+  const data = value.data ?? value.models;
+  if (!Array.isArray(data)) {
+    return [];
+  }
+  const names = data.flatMap((model) => {
+    if (typeof model === "string") {
+      const trimmed2 = model.trim();
+      return trimmed2 ? [trimmed2] : [];
+    }
+    if (!model || typeof model !== "object") {
+      return [];
+    }
+    const entry = model;
+    const name = entry.id ?? entry.name ?? entry.model;
+    if (typeof name !== "string") {
+      return [];
+    }
+    const trimmed = name.trim();
+    return trimmed ? [trimmed] : [];
+  });
+  return [...new Set(names)].sort((a2, b) => a2.localeCompare(b));
+}
+function parseOllamaModelNamesFromTags(value) {
+  if (!value || typeof value !== "object" || !("models" in value)) {
+    return [];
+  }
+  const models = value.models;
+  if (!Array.isArray(models)) {
+    return [];
+  }
+  const names = models.flatMap((model) => {
+    if (!model || typeof model !== "object") {
+      return [];
+    }
+    const entry = model;
+    const name = entry.name ?? entry.model;
+    if (typeof name !== "string") {
+      return [];
+    }
+    const trimmed = name.trim();
+    return trimmed ? [trimmed] : [];
+  });
+  return [...new Set(names)].sort((a2, b) => a2.localeCompare(b));
+}
+function modelDefinitionsFromNames(provider, names, source) {
+  const providerName = getProviderDefinition(provider).displayName;
+  return names.map((name) => ({
+    id: name,
+    displayName: name,
+    description: source === "cache" ? `Cached ${providerName} model` : `Discovered from ${providerName}`
+  }));
+}
+function getCachedProviderModels(provider) {
+  return cachedModelsByProvider.get(provider) ?? [];
+}
+function cacheProviderModelsForProvider(providerId, models) {
   const provider = resolveProviderId(providerId);
   if (!provider) {
+    return;
+  }
+  const definitions = typeof models[0] === "string" ? modelDefinitionsFromNames(provider, models, "cache") : models;
+  if (definitions.length > 0) {
+    cachedModelsByProvider.set(provider, definitions);
+  }
+}
+function staticModelsForProvider(provider) {
+  return (PROVIDER_MODELS[provider] ?? []).filter((model) => !model.isDynamic);
+}
+async function discoverLiveModelsForProvider(provider, options = {}) {
+  const definition = getProviderDefinition(provider);
+  if (!definition.endpointKind) {
     return [];
   }
-  return PROVIDER_MODELS[provider] ?? [];
+  const settings = options.settings ?? getInitialSettings();
+  const baseUrl = providerBaseUrl(provider, definition, settings);
+  if (!baseUrl) {
+    throw new Error(`No base_url configured for provider "${provider}".`);
+  }
+  const url3 = endpointUrl(baseUrl, definition.endpointKind);
+  const env4 = options.adapters?.env ?? process.env;
+  const response = await (options.adapters?.fetch ?? fetch)(url3, {
+    method: "GET",
+    signal: options.signal,
+    headers: definition.accessType === "api" && definition.envKey && env4[definition.envKey] ? { Authorization: `Bearer ${env4[definition.envKey]}` } : undefined
+  });
+  if (!response.ok) {
+    throw new Error(`${url3} returned HTTP ${response.status}.`);
+  }
+  const body = await response.json();
+  const names = definition.endpointKind === "ollama" ? parseOllamaModelNamesFromTags(body) : parseOpenAICompatibleModelNames(body);
+  return modelDefinitionsFromNames(provider, names, "live");
 }
-function isModelSupportedByProvider(providerId, modelId) {
+async function listModelsForProviderWithSource(providerId, options = {}) {
   const provider = resolveProviderId(providerId);
   if (!provider) {
-    return false;
+    return {
+      provider: "ollama",
+      models: [],
+      source: "static",
+      warning: `Unknown provider "${providerId}". Run: ur provider list`
+    };
   }
-  const models = PROVIDER_MODELS[provider];
-  if (!models) {
-    return false;
+  const definition = getProviderDefinition(provider);
+  if (definition.modelDiscoveryType === "static") {
+    return {
+      provider,
+      models: staticModelsForProvider(provider),
+      source: "static"
+    };
   }
-  const hasDynamic = models.some((m) => m.isDynamic);
-  if (hasDynamic) {
-    return true;
+  try {
+    const liveModels = await discoverLiveModelsForProvider(provider, options);
+    if (liveModels.length > 0) {
+      cachedModelsByProvider.set(provider, liveModels);
+      return {
+        provider,
+        models: liveModels,
+        source: "live"
+      };
+    }
+    const cachedModels = getCachedProviderModels(provider);
+    if (cachedModels.length > 0) {
+      return {
+        provider,
+        models: cachedModels,
+        source: "cache",
+        warning: `Live model discovery for "${provider}" returned no models. Showing cached ${provider} models only.`
+      };
+    }
+    const staticModels = staticModelsForProvider(provider);
+    return {
+      provider,
+      models: staticModels,
+      source: staticModels.length > 0 ? "static" : "live",
+      warning: `Live model discovery for "${provider}" returned no models.`
+    };
+  } catch (error40) {
+    const cachedModels = getCachedProviderModels(provider);
+    if (cachedModels.length > 0) {
+      return {
+        provider,
+        models: cachedModels,
+        source: "cache",
+        warning: `Live model discovery for "${provider}" failed: ${error40 instanceof Error ? error40.message : String(error40)}. Showing cached ${provider} models only.`
+      };
+    }
+    const staticModels = staticModelsForProvider(provider);
+    return {
+      provider,
+      models: staticModels,
+      source: staticModels.length > 0 ? "static" : "live",
+      warning: `Live model discovery for "${provider}" failed: ${error40 instanceof Error ? error40.message : String(error40)}.`
+    };
+  }
+}
+function listModelsForProvider(providerId) {
+  const provider = resolveProviderId(providerId);
+  if (!provider) {
+    return [];
   }
-  return models.some((m) => m.id === modelId);
+  return PROVIDER_MODELS[provider] ?? [];
+}
+function isModelSupportedByProvider(providerId, modelId) {
+  return validateProviderModelPair(providerId, modelId).valid;
 }
 function getDefaultModelForProvider(providerId) {
   const provider = resolveProviderId(providerId);
@@ -54154,14 +54388,27 @@ function getDefaultModelForProvider(providerId) {
   if (!models) {
     return;
   }
-  const defaultModel = models.find((m) => m.isDefault);
+  const defaultModel = models.find((m) => m.isDefault && !m.isDynamic) ?? models.find((m) => !m.isDynamic);
   return defaultModel?.id;
 }
 function getValidModelIdsForProvider(providerId) {
-  const models = listModelsForProvider(providerId);
-  return models.filter((m) => !m.isDynamic).map((m) => m.id);
+  const provider = resolveProviderId(providerId);
+  if (!provider) {
+    return [];
+  }
+  const cached2 = getCachedProviderModels(provider);
+  if (cached2.length > 0) {
+    return cached2.map((model) => model.id);
+  }
+  return staticModelsForProvider(provider).map((model) => model.id);
+}
+function formatInvalidProviderModelMessage(providerId, modelId, validModels, suggestedModel) {
+  const provider = resolveProviderId(providerId) ?? String(providerId);
+  const validList = validModels.length > 0 ? validModels.join(", ") : "(no models discovered)";
+  const suggested = suggestedModel ?? validModels[0] ?? "<valid-model>";
+  return `Model "${modelId}" is not available for provider "${provider}". Valid models for ${provider}: ${validList}. Run /model and choose a model from ${provider}, or run: ur config set model ${suggested}`;
 }
-function validateProviderModelCompatibility(providerId, modelId) {
+function validateProviderModelPair(providerId, modelId, options = {}) {
   const provider = resolveProviderId(providerId);
   if (!provider) {
     return {
@@ -54178,26 +54425,66 @@ function validateProviderModelCompatibility(providerId, modelId) {
       validModels: []
     };
   }
-  const hasDynamic = models.some((m) => m.isDynamic);
-  if (hasDynamic) {
+  const suppliedModels = (options.availableModels ?? []).map((model) => typeof model === "string" ? model : model.id);
+  const cachedModels = getCachedProviderModels(provider).map((model) => model.id);
+  const staticModelIds = staticModelsForProvider(provider).map((model) => model.id);
+  const validModelIds = suppliedModels.length > 0 ? suppliedModels : cachedModels.length > 0 ? cachedModels : staticModelIds;
+  if (validModelIds.includes(modelId)) {
     return { valid: true };
   }
-  const modelExists = models.some((m) => m.id === modelId);
-  if (modelExists) {
+  if (models.some((m) => m.isDynamic) && options.allowUncachedDynamic && validModelIds.length === 0) {
     return { valid: true };
   }
-  const validModelIds = getValidModelIdsForProvider(provider);
   const defaultModel = getDefaultModelForProvider(provider);
   return {
     valid: false,
-    error: `Model "${modelId}" is not available for provider "${provider}".`,
+    error: formatInvalidProviderModelMessage(provider, modelId, validModelIds, defaultModel),
     validModels: validModelIds,
     suggestedModel: defaultModel
   };
 }
-var PROVIDER_IDS, LOCALHOST_RE, PROVIDERS, PROVIDER_ALIAS_ENTRIES, PROVIDER_ALIASES, PROVIDER_MODELS;
+function setProviderModel(providerId, modelId, options = {}) {
+  const provider = resolveProviderId(providerId);
+  if (!provider) {
+    return {
+      ok: false,
+      message: `Unknown provider "${providerId}". Run: ur provider list`
+    };
+  }
+  const validation = validateProviderModelPair(provider, modelId, {
+    availableModels: options.availableModels
+  });
+  if (validation.valid === false) {
+    return {
+      ok: false,
+      message: validation.error
+    };
+  }
+  const result = updateSettingsForSource("userSettings", {
+    provider: {
+      active: provider,
+      model: modelId
+    },
+    model: modelId
+  });
+  if (result.error) {
+    return {
+      ok: false,
+      message: `Failed to write UR-AGENT settings: ${result.error.message}`
+    };
+  }
+  return {
+    ok: true,
+    message: `Selected provider ${provider} (${getProviderAccessTypeLabel(getProviderDefinition(provider))}) with model ${modelId} (${options.modelSource ?? "static"}).`,
+    provider,
+    model: modelId,
+    modelSource: options.modelSource ?? "static"
+  };
+}
+var PROVIDER_IDS, LOCALHOST_RE, PROVIDERS, PROVIDER_ALIAS_ENTRIES, PROVIDER_ALIASES, PROVIDER_MODELS, cachedModelsByProvider, validateProviderModelCompatibility;
 var init_providerRegistry = __esm(() => {
   init_execFileNoThrow();
+  init_ollamaConfig();
   init_settings2();
   init_which();
   PROVIDER_IDS = [
@@ -54219,11 +54506,17 @@ var init_providerRegistry = __esm(() => {
   PROVIDERS = {
     "codex-cli": {
       id: "codex-cli",
-      displayName: "ChatGPT/Codex",
-      statusBarName: "ChatGPT/Codex",
+      displayName: "Codex CLI",
+      statusBarName: "Codex CLI",
       accessType: "subscription",
+      credentialType: "cli-login",
+      modelDiscoveryType: "static",
+      statusCheck: "cli-login",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "subscription",
       legalPath: "official Codex CLI login",
+      accessPathLabel: "subscription login via official Codex CLI",
       commandCandidates: ["codex"],
       versionArgs: ["--version"],
       statusArgs: ["login", "status"],
@@ -54235,8 +54528,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "Claude Code",
       statusBarName: "Claude Code",
       accessType: "subscription",
+      credentialType: "cli-login",
+      modelDiscoveryType: "static",
+      statusCheck: "cli-login",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "subscription",
       legalPath: "official Claude Code CLI login",
+      accessPathLabel: "subscription login via official Claude Code CLI",
       commandCandidates: ["claude"],
       versionArgs: ["--version"],
       statusArgs: ["auth", "status"],
@@ -54247,8 +54546,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "Gemini CLI",
       statusBarName: "Gemini CLI",
       accessType: "subscription",
+      credentialType: "cli-login",
+      modelDiscoveryType: "static",
+      statusCheck: "cli-login",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "enterprise-login",
       legalPath: "official Gemini Code Assist login",
+      accessPathLabel: "subscription login via official Gemini CLI",
       commandCandidates: ["gemini"],
       versionArgs: ["--version"],
       loginArgs: [],
@@ -54259,8 +54564,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "Antigravity",
       statusBarName: "Antigravity",
       accessType: "subscription",
+      credentialType: "cli-login",
+      modelDiscoveryType: "static",
+      statusCheck: "cli-login",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "personal-login",
       legalPath: "official Antigravity CLI login, where supported",
+      accessPathLabel: "subscription login via official Antigravity CLI",
       commandCandidates: ["agy", "antigravity", "google-antigravity", "ag"],
       versionArgs: ["--version"],
       loginArgs: []
@@ -54270,17 +54581,29 @@ var init_providerRegistry = __esm(() => {
       displayName: "OpenAI API",
       statusBarName: "OpenAI",
       accessType: "api",
+      credentialType: "api-key",
+      modelDiscoveryType: "static",
+      statusCheck: "api-key",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "api",
       legalPath: "OPENAI_API_KEY",
+      accessPathLabel: "API key from OPENAI_API_KEY",
       envKey: "OPENAI_API_KEY"
     },
     "anthropic-api": {
       id: "anthropic-api",
-      displayName: "Anthropic Claude API",
-      statusBarName: "Anthropic",
+      displayName: "Claude API",
+      statusBarName: "Claude API",
       accessType: "api",
+      credentialType: "api-key",
+      modelDiscoveryType: "static",
+      statusCheck: "api-key",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "api",
       legalPath: "ANTHROPIC_API_KEY",
+      accessPathLabel: "API key from ANTHROPIC_API_KEY",
       envKey: "ANTHROPIC_API_KEY"
     },
     "gemini-api": {
@@ -54288,8 +54611,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "Gemini API",
       statusBarName: "Gemini API",
       accessType: "api",
+      credentialType: "api-key",
+      modelDiscoveryType: "static",
+      statusCheck: "api-key",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "api",
       legalPath: "GEMINI_API_KEY",
+      accessPathLabel: "API key from GEMINI_API_KEY",
       envKey: "GEMINI_API_KEY"
     },
     openrouter: {
@@ -54297,8 +54626,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "OpenRouter",
       statusBarName: "OpenRouter",
       accessType: "api",
+      credentialType: "api-key",
+      modelDiscoveryType: "static",
+      statusCheck: "api-key",
+      listModels: "static",
+      validateModel: "static-list",
       authMode: "api",
       legalPath: "OPENROUTER_API_KEY",
+      accessPathLabel: "API key from OPENROUTER_API_KEY",
       envKey: "OPENROUTER_API_KEY"
     },
     "openai-compatible": {
@@ -54306,8 +54641,15 @@ var init_providerRegistry = __esm(() => {
       displayName: "OpenAI-compatible",
       statusBarName: "OpenAI-compatible",
       accessType: "api",
+      accessTypeLabel: "server/api",
+      credentialType: "openai-compatible-endpoint",
+      modelDiscoveryType: "live",
+      statusCheck: "endpoint",
+      listModels: "openai-compatible-models",
+      validateModel: "discovered-list",
       authMode: "api",
       legalPath: "user-selected OpenAI-compatible base URL with API key only when required by that endpoint",
+      accessPathLabel: "OpenAI-compatible endpoint",
       envKey: "OPENAI_API_KEY",
       endpointKind: "openai-compatible"
     },
@@ -54316,8 +54658,14 @@ var init_providerRegistry = __esm(() => {
       displayName: "Ollama",
       statusBarName: "Ollama",
       accessType: "local",
+      credentialType: "local-runtime",
+      modelDiscoveryType: "live",
+      statusCheck: "endpoint",
+      listModels: "ollama-tags",
+      validateModel: "discovered-list",
       authMode: "local",
       legalPath: "localhost Ollama runtime",
+      accessPathLabel: "local Ollama runtime",
       defaultBaseUrl: "http://localhost:11434",
       endpointKind: "ollama"
     },
@@ -54325,9 +54673,16 @@ var init_providerRegistry = __esm(() => {
       id: "lmstudio",
       displayName: "LM Studio",
       statusBarName: "LM Studio",
-      accessType: "local",
+      accessType: "server",
+      accessTypeLabel: "local/server",
+      credentialType: "openai-compatible-endpoint",
+      modelDiscoveryType: "live",
+      statusCheck: "endpoint",
+      listModels: "openai-compatible-models",
+      validateModel: "discovered-list",
       authMode: "local",
       legalPath: "local OpenAI-compatible server",
+      accessPathLabel: "local OpenAI-compatible endpoint",
       defaultBaseUrl: "http://localhost:1234/v1",
       endpointKind: "openai-compatible"
     },
@@ -54335,9 +54690,16 @@ var init_providerRegistry = __esm(() => {
       id: "llama.cpp",
       displayName: "llama.cpp",
       statusBarName: "llama.cpp",
-      accessType: "local",
+      accessType: "server",
+      accessTypeLabel: "local/server",
+      credentialType: "openai-compatible-endpoint",
+      modelDiscoveryType: "live",
+      statusCheck: "endpoint",
+      listModels: "openai-compatible-models",
+      validateModel: "discovered-list",
       authMode: "local",
       legalPath: "local OpenAI-compatible server",
+      accessPathLabel: "local OpenAI-compatible endpoint",
       defaultBaseUrl: "http://localhost:8080/v1",
       endpointKind: "openai-compatible"
     },
@@ -54345,9 +54707,16 @@ var init_providerRegistry = __esm(() => {
       id: "vllm",
       displayName: "vLLM",
       statusBarName: "vLLM",
-      accessType: "local",
+      accessType: "server",
+      accessTypeLabel: "local/server",
+      credentialType: "openai-compatible-endpoint",
+      modelDiscoveryType: "live",
+      statusCheck: "endpoint",
+      listModels: "openai-compatible-models",
+      validateModel: "discovered-list",
       authMode: "local",
       legalPath: "OpenAI-compatible server",
+      accessPathLabel: "OpenAI-compatible endpoint runtime",
       defaultBaseUrl: "http://localhost:8000/v1",
       endpointKind: "openai-compatible"
     }
@@ -54413,36 +54782,36 @@ var init_providerRegistry = __esm(() => {
   ]));
   PROVIDER_MODELS = {
     "codex-cli": [
-      { id: "gpt-5.5", displayName: "GPT-5.5", description: "Latest OpenAI model", isDefault: true },
-      { id: "gpt-5.4", displayName: "GPT-5.4", description: "Advanced reasoning and coding" },
-      { id: "gpt-5.4-mini", displayName: "GPT-5.4 Mini", description: "Fast, efficient variant" },
-      { id: "gpt-4o", displayName: "GPT-4o", description: "Previous generation flagship" },
-      { id: "gpt-4o-mini", displayName: "GPT-4o Mini", description: "Fast GPT-4o variant" },
-      { id: "o1", displayName: "o1", description: "Deep reasoning model" },
-      { id: "o3-mini", displayName: "o3-mini", description: "Fast reasoning model" }
+      { id: "codex/gpt-5.5", displayName: "GPT-5.5 (Codex CLI)", description: "Subscription model through official Codex CLI login", isDefault: true },
+      { id: "codex/gpt-5.4", displayName: "GPT-5.4 (Codex CLI)", description: "Subscription model through official Codex CLI login" },
+      { id: "codex/gpt-5.4-mini", displayName: "GPT-5.4 Mini (Codex CLI)", description: "Fast subscription model through official Codex CLI login" },
+      { id: "codex/gpt-4o", displayName: "GPT-4o (Codex CLI)", description: "Subscription model through official Codex CLI login" },
+      { id: "codex/gpt-4o-mini", displayName: "GPT-4o Mini (Codex CLI)", description: "Fast subscription model through official Codex CLI login" },
+      { id: "codex/o1", displayName: "o1 (Codex CLI)", description: "Reasoning model through official Codex CLI login" },
+      { id: "codex/o3-mini", displayName: "o3-mini (Codex CLI)", description: "Fast reasoning model through official Codex CLI login" }
     ],
     "claude-code-cli": [
-      { id: "claude-sonnet-5", displayName: "Claude Sonnet 5", description: "Balanced performance and speed", isDefault: true },
-      { id: "claude-opus-4-8", displayName: "Claude Opus 4.8", description: "Most powerful Claude model" },
-      { id: "claude-opus-4-7", displayName: "Claude Opus 4.7", description: "High-end reasoning" },
-      { id: "claude-opus-4-6", displayName: "Claude Opus 4.6", description: "Advanced problem solving" },
-      { id: "claude-opus-4-5", displayName: "Claude Opus 4.5", description: "Previous Opus generation" },
-      { id: "claude-sonnet-4-6", displayName: "Claude Sonnet 4.6", description: "Fast Sonnet variant" },
-      { id: "claude-sonnet-4-5", displayName: "Claude Sonnet 4.5", description: "Previous Sonnet generation" },
-      { id: "claude-haiku-4-5", displayName: "Claude Haiku 4.5", description: "Fastest Claude model" }
+      { id: "claude-code/sonnet-5", displayName: "Claude Sonnet 5 (Claude Code)", description: "Subscription model through official Claude Code login", isDefault: true },
+      { id: "claude-code/opus-4-8", displayName: "Claude Opus 4.8 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/opus-4-7", displayName: "Claude Opus 4.7 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/opus-4-6", displayName: "Claude Opus 4.6 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/opus-4-5", displayName: "Claude Opus 4.5 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/sonnet-4-6", displayName: "Claude Sonnet 4.6 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/sonnet-4-5", displayName: "Claude Sonnet 4.5 (Claude Code)", description: "Subscription model through official Claude Code login" },
+      { id: "claude-code/haiku-4-5", displayName: "Claude Haiku 4.5 (Claude Code)", description: "Subscription model through official Claude Code login" }
     ],
     "gemini-cli": [
-      { id: "gemini-3.5-flash", displayName: "Gemini 3.5 Flash", description: "Most intelligent for agentic tasks", isDefault: true },
-      { id: "gemini-3.1-pro", displayName: "Gemini 3.1 Pro", description: "Advanced problem solving (preview)" },
-      { id: "gemini-3.1-flash-lite", displayName: "Gemini 3.1 Flash Lite", description: "Budget-friendly performance" },
-      { id: "gemini-2.5-pro", displayName: "Gemini 2.5 Pro", description: "Complex reasoning and coding" },
-      { id: "gemini-2.5-flash", displayName: "Gemini 2.5 Flash", description: "Low-latency tasks" },
-      { id: "gemini-2.5-flash-lite", displayName: "Gemini 2.5 Flash Lite", description: "Fastest Gemini model" }
+      { id: "gemini-cli/gemini-3.5-flash", displayName: "Gemini 3.5 Flash (Gemini CLI)", description: "Subscription model through official Gemini CLI login", isDefault: true },
+      { id: "gemini-cli/gemini-3.1-pro", displayName: "Gemini 3.1 Pro (Gemini CLI)", description: "Subscription model through official Gemini CLI login" },
+      { id: "gemini-cli/gemini-3.1-flash-lite", displayName: "Gemini 3.1 Flash Lite (Gemini CLI)", description: "Subscription model through official Gemini CLI login" },
+      { id: "gemini-cli/gemini-2.5-pro", displayName: "Gemini 2.5 Pro (Gemini CLI)", description: "Subscription model through official Gemini CLI login" },
+      { id: "gemini-cli/gemini-2.5-flash", displayName: "Gemini 2.5 Flash (Gemini CLI)", description: "Subscription model through official Gemini CLI login" },
+      { id: "gemini-cli/gemini-2.5-flash-lite", displayName: "Gemini 2.5 Flash Lite (Gemini CLI)", description: "Subscription model through official Gemini CLI login" }
     ],
     "antigravity-cli": [
-      { id: "gemini-3.5-flash", displayName: "Gemini 3.5 Flash", description: "Most intelligent for agentic tasks", isDefault: true },
-      { id: "gemini-2.5-pro", displayName: "Gemini 2.5 Pro", description: "Complex reasoning and coding" },
-      { id: "gemini-2.5-flash", displayName: "Gemini 2.5 Flash", description: "Low-latency tasks" }
+      { id: "antigravity/gemini-3.5-flash", displayName: "Gemini 3.5 Flash (Antigravity)", description: "Subscription model through official Antigravity login", isDefault: true },
+      { id: "antigravity/gemini-2.5-pro", displayName: "Gemini 2.5 Pro (Antigravity)", description: "Subscription model through official Antigravity login" },
+      { id: "antigravity/gemini-2.5-flash", displayName: "Gemini 2.5 Flash (Antigravity)", description: "Subscription model through official Antigravity login" }
     ],
     "openai-api": [
       { id: "gpt-5.5", displayName: "GPT-5.5", description: "Latest OpenAI model", isDefault: true },
@@ -54496,6 +54865,8 @@ var init_providerRegistry = __esm(() => {
       { id: "dynamic", displayName: "Discovered Models", description: "Models discovered from vLLM server", isDynamic: true, isDefault: true }
     ]
   };
+  cachedModelsByProvider = new Map;
+  validateProviderModelCompatibility = validateProviderModelPair;
 });
 
 // src/utils/model/ollamaTuning.ts
@@ -68278,7 +68649,7 @@ var init_auth = __esm(() => {
 
 // src/utils/userAgent.ts
 function getURCodeUserAgent() {
-  return `ur/${"1.27.4"}`;
+  return `ur/${"1.27.5"}`;
 }
 
 // src/utils/workloadContext.ts
@@ -68300,7 +68671,7 @@ function getUserAgent() {
   const clientApp = process.env.UR_AGENT_SDK_CLIENT_APP ? `, client-app/${process.env.UR_AGENT_SDK_CLIENT_APP}` : "";
   const workload = getWorkload();
   const workloadSuffix = workload ? `, workload/${workload}` : "";
-  return `ur-cli/${"1.27.4"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
+  return `ur-cli/${"1.27.5"} (${process.env.USER_TYPE}, ${process.env.UR_CODE_ENTRYPOINT ?? "cli"}${agentSdkVersion}${clientApp}${workloadSuffix})`;
 }
 function getMCPUserAgent() {
   const parts = [];
@@ -68314,7 +68685,7 @@ function getMCPUserAgent() {
     parts.push(`client-app/${process.env.UR_AGENT_SDK_CLIENT_APP}`);
   }
   const suffix = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-  return `ur/${"1.27.4"}${suffix}`;
+  return `ur/${"1.27.5"}${suffix}`;
 }
 function getWebFetchUserAgent() {
   return `UR-User (${getURCodeUserAgent()})`;
@@ -68452,7 +68823,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "1.27.4",
+      appVersion: "1.27.5",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -74969,7 +75340,7 @@ var init_metadata = __esm(() => {
   COMPOUND_OPERATOR_REGEX = /\s*(?:&&|\|\||[;|])\s*/;
   WHITESPACE_REGEX = /\s+/;
   getVersionBase = memoize_default(() => {
-    const match = "1.27.4".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
+    const match = "1.27.5".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
     return match ? match[0] : undefined;
   });
   buildEnvContext = memoize_default(async () => {
@@ -75009,7 +75380,7 @@ var init_metadata = __esm(() => {
       isGithubAction: isEnvTruthy(process.env.GITHUB_ACTIONS),
       isURCodeAction: isEnvTruthy(process.env.UR_CODE_ACTION),
       isURAiAuth: isURAISubscriber2(),
-      version: "1.27.4",
+      version: "1.27.5",
       versionBase: getVersionBase(),
       buildTime: "",
       deploymentEnvironment: env2.detectDeploymentEnvironment(),
@@ -75679,7 +76050,7 @@ function initialize1PEventLogging() {
   const platform2 = getPlatform();
   const attributes = {
     [import_semantic_conventions4.ATTR_SERVICE_NAME]: "ur",
-    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.27.4"
+    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "1.27.5"
   };
   if (platform2 === "wsl") {
     const wslVersion = getWslVersion();
@@ -75706,7 +76077,7 @@ function initialize1PEventLogging() {
       })
     ]
   });
-  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.27.4");
+  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.urhq.ur.events", "1.27.5");
 }
 async function reinitialize1PEventLoggingIfConfigChanged() {
   if (!is1PEventLoggingEnabled() || !firstPartyEventLoggerProvider) {
@@ -81003,7 +81374,7 @@ function formatAgentTrendReport(report = buildAgentTrendReport()) {
 function formatA2AAgentCard(options = {}, pretty = true) {
   return JSON.stringify(buildA2AAgentCard(options), null, pretty ? 2 : 0);
 }
-var urVersion = "1.27.4", coverage, priorityRoadmap;
+var urVersion = "1.27.5", coverage, priorityRoadmap;
 var init_trends = __esm(() => {
   coverage = [
     {
@@ -82995,7 +83366,7 @@ function getAttributionHeader(fingerprint) {
   if (!isAttributionHeaderEnabled()) {
     return "";
   }
-  const version2 = `${"1.27.4"}.${fingerprint}`;
+  const version2 = `${"1.27.5"}.${fingerprint}`;
   const entrypoint = process.env.UR_CODE_ENTRYPOINT ?? "unknown";
   const cch = "";
   const workload = getWorkload();
@@ -190664,7 +191035,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "1.27.4";
+    attributes["app.version"] = "1.27.5";
   }
   const oauthAccount = getOauthAccountInfo();
   if (oauthAccount) {
@@ -226066,7 +226437,7 @@ function getInstallationEnv() {
   return;
 }
 function getURCodeVersion() {
-  return "1.27.4";
+  return "1.27.5";
 }
 async function getInstalledVSCodeExtensionVersion(command) {
   const { stdout } = await execFileNoThrow(command, ["--list-extensions", "--show-versions"], {
@@ -228905,7 +229276,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client2 = new Client({
       name: "ur",
       title: "UR",
-      version: "1.27.4",
+      version: "1.27.5",
       description: "UR-AGENT autonomous engineering workflow engine",
       websiteUrl: PRODUCT_URL
     }, {
@@ -229259,7 +229630,7 @@ var init_client5 = __esm(() => {
       const client2 = new Client({
         name: "ur",
         title: "UR",
-        version: "1.27.4",
+        version: "1.27.5",
         description: "UR-AGENT autonomous engineering workflow engine",
         websiteUrl: PRODUCT_URL
       }, {
@@ -239072,9 +239443,9 @@ async function assertMinVersion() {
   if (false) {}
   try {
     const versionConfig = await getDynamicConfig_BLOCKS_ON_INIT("tengu_version_config", { minVersion: "0.0.0" });
-    if (versionConfig.minVersion && lt("1.27.4", versionConfig.minVersion)) {
+    if (versionConfig.minVersion && lt("1.27.5", versionConfig.minVersion)) {
       console.error(`
-It looks like your version of UR (${"1.27.4"}) needs an update.
+It looks like your version of UR (${"1.27.5"}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
 
 To update, please run:
@@ -239290,7 +239661,7 @@ async function installGlobalPackage(specificVersion) {
     logError2(new AutoUpdaterError("Another process is currently installing an update"));
     logEvent("tengu_auto_updater_lock_contention", {
       pid: process.pid,
-      currentVersion: "1.27.4"
+      currentVersion: "1.27.5"
     });
     return "in_progress";
   }
@@ -239299,7 +239670,7 @@ async function installGlobalPackage(specificVersion) {
     if (!env2.isRunningWithBun() && env2.isNpmFromWindowsPath()) {
       logError2(new Error("Windows NPM detected in WSL environment"));
       logEvent("tengu_auto_updater_windows_npm_in_wsl", {
-        currentVersion: "1.27.4"
+        currentVersion: "1.27.5"
       });
       console.error(`
 Error: Windows NPM detected in WSL
@@ -239834,7 +240205,7 @@ function detectLinuxGlobPatternWarnings() {
 }
 async function getDoctorDiagnostic() {
   const installationType = await getCurrentInstallationType();
-  const version2 = typeof MACRO !== "undefined" ? "1.27.4" : "unknown";
+  const version2 = typeof MACRO !== "undefined" ? "1.27.5" : "unknown";
   const installationPath = await getInstallationPath();
   const invokedBinary = getInvokedBinary();
   const multipleInstallations = await detectMultipleInstallations();
@@ -240769,8 +241140,8 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
     const maxVersion = await getMaxVersion();
     if (maxVersion && gt(version2, maxVersion)) {
       logForDebugging(`Native installer: maxVersion ${maxVersion} is set, capping update from ${version2} to ${maxVersion}`);
-      if (gte("1.27.4", maxVersion)) {
-        logForDebugging(`Native installer: current version ${"1.27.4"} is already at or above maxVersion ${maxVersion}, skipping update`);
+      if (gte("1.27.5", maxVersion)) {
+        logForDebugging(`Native installer: current version ${"1.27.5"} is already at or above maxVersion ${maxVersion}, skipping update`);
         logEvent("tengu_native_update_skipped_max_version", {
           latency_ms: Date.now() - startTime,
           max_version: maxVersion,
@@ -240781,7 +241152,7 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
       version2 = maxVersion;
     }
   }
-  if (!forceReinstall && version2 === "1.27.4" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
+  if (!forceReinstall && version2 === "1.27.5" && await versionIsAvailable(version2) && await isPossibleURBinary(executablePath)) {
     logForDebugging(`Found ${version2} at ${executablePath}, skipping install`);
     logEvent("tengu_native_update_complete", {
       latency_ms: Date.now() - startTime,
@@ -337693,7 +338064,7 @@ function Feedback({
       platform: env2.platform,
       gitRepo: envInfo.isGit,
       terminal: env2.terminal,
-      version: "1.27.4",
+      version: "1.27.5",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -337885,7 +338256,7 @@ function Feedback({
                       ", ",
                       env2.terminal,
                       ", v",
-                      "1.27.4"
+                      "1.27.5"
                     ]
                   }, undefined, true, undefined, this)
                 ]
@@ -337991,7 +338362,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env2.platform}
 ` + `- Terminal: ${env2.terminal}
-` + `- Version: ${"1.27.4"}
+` + `- Version: ${"1.27.5"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -341102,7 +341473,7 @@ function buildPrimarySection() {
   }, undefined, false, undefined, this);
   return [{
     label: "Version",
-    value: "1.27.4"
+    value: "1.27.5"
   }, {
     label: "Session name",
     value: nameValue
@@ -341916,55 +342287,35 @@ function ModelPicker({
   const appThinkingEnabled = useAppState(selectThinkingEnabled);
   const [hasToggledThinking, setHasToggledThinking] = import_react101.useState(false);
   const [thinkingEnabled, setThinkingEnabled] = import_react101.useState(() => appThinkingEnabled ?? shouldEnableThinkingByDefault());
-  const [ollamaModelOptions, setOllamaModelOptions] = import_react101.useState([]);
   const [providerModelOptions, setProviderModelOptions] = import_react101.useState([]);
-  const currentProvider = getAPIProvider();
-  const isOllamaProvider = currentProvider === "ollama";
-  const isLocalProvider = ["ollama", "lmstudio", "llama.cpp", "vllm"].includes(currentProvider);
+  const [pickerError, setPickerError] = import_react101.useState(null);
+  const currentProvider = getActiveProviderSettings(getSettingsForSource("userSettings") ?? {}).active ?? "ollama";
   import_react101.useEffect(() => {
-    if (isOllamaProvider) {
-      const controller = new AbortController;
-      getOllamaModelOptions(controller.signal).then((options2) => {
-        if (!controller.signal.aborted) {
-          setOllamaModelOptions(options2);
-          setProviderModelOptions(options2);
-        }
-      }).catch(() => {
-        if (!controller.signal.aborted) {
-          setOllamaModelOptions([]);
-          setProviderModelOptions([]);
-        }
-      });
-      return () => controller.abort();
-    }
-    if (isLocalProvider) {
-      const controller = new AbortController;
-      getOllamaModelOptions(controller.signal).then((options2) => {
-        if (!controller.signal.aborted) {
-          setProviderModelOptions(options2);
-        }
-      }).catch(() => {
-        if (!controller.signal.aborted) {
-          setProviderModelOptions([]);
-        }
-      });
-      return () => controller.abort();
-    }
-    const models = listModelsForProvider(currentProvider);
-    if (models.length > 0) {
-      const options2 = models.map((model) => ({
+    const controller = new AbortController;
+    listModelsForProviderWithSource(currentProvider, {
+      settings: getSettingsForSource("userSettings") ?? undefined,
+      signal: controller.signal
+    }).then((result) => {
+      if (controller.signal.aborted)
+        return;
+      setProviderModelOptions(result.models.map((model) => ({
         value: model.id,
         label: model.displayName,
-        description: model.description
-      }));
-      setProviderModelOptions(options2);
-    } else {
+        description: `${model.description} \xB7 ${result.source}`
+      })));
+      setPickerError(result.warning ?? null);
+    }).catch((error40) => {
+      if (controller.signal.aborted)
+        return;
       setProviderModelOptions([]);
-    }
-  }, [currentProvider, isOllamaProvider, isLocalProvider]);
-  const baseModelOptions = getModelOptions(isFastMode ?? false);
-  const modelOptions = isLocalProvider ? providerModelOptions : providerModelOptions.length > 0 ? providerModelOptions : mergeModelOptions(baseModelOptions, ollamaModelOptions);
-  const optionsWithInitial = initial !== null && !modelOptions.some((opt) => opt.value === initial) ? [
+      setPickerError(error40 instanceof Error ? error40.message : String(error40));
+    });
+    return () => controller.abort();
+  }, [currentProvider]);
+  const modelOptions = providerModelOptions;
+  const optionsWithInitial = initial !== null && validateProviderModelPair(currentProvider, initial, {
+    availableModels: modelOptions.map((option) => option.value)
+  }).valid && !modelOptions.some((opt) => opt.value === initial) ? [
     ...modelOptions,
     {
       value: initial,
@@ -342015,6 +342366,15 @@ function ModelPicker({
     logEvent("tengu_model_command_menu_effort", {
       effort
     });
+    if (value !== NO_PREFERENCE) {
+      const validation = validateProviderModelPair(currentProvider, value, {
+        availableModels: modelOptions.map((option) => option.value)
+      });
+      if (validation.valid === false) {
+        setPickerError(validation.error);
+        return;
+      }
+    }
     if (!skipSettingsWrite) {
       const effortLevel = resolvePickerEffortPersistence(effort, getDefaultEffortLevelForOption(value), getSettingsForSource("userSettings")?.effortLevel, hasToggledEffort);
       const persistable = toPersistableEffort(effortLevel);
@@ -342187,6 +342547,13 @@ function ModelPicker({
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
+          pickerError && /* @__PURE__ */ jsx_dev_runtime172.jsxDEV(ThemedBox_default, {
+            marginBottom: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime172.jsxDEV(ThemedText, {
+              color: "error",
+              children: pickerError
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this),
           fastModeNotice
         ]
       }, undefined, true, undefined, this),
@@ -342264,8 +342631,6 @@ var init_ModelPicker = __esm(() => {
   init_AppState();
   init_effort();
   init_model();
-  init_modelOptions();
-  init_ollamaModels();
   init_settings2();
   init_thinking();
   init_providerRegistry();
@@ -344408,7 +344773,7 @@ function Config({
         }
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_dev_runtime177.jsxDEV(ChannelDowngradeDialog, {
-      currentVersion: "1.27.4",
+      currentVersion: "1.27.5",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -344420,7 +344785,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "1.27.4";
+          newSettings.minimumVersion = "1.27.5";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev_27) => ({
@@ -352490,7 +352855,7 @@ function HelpV2(t0) {
   let t6;
   if ($3[31] !== tabs) {
     t6 = /* @__PURE__ */ jsx_dev_runtime204.jsxDEV(Tabs, {
-      title: `UR v${"1.27.4"}`,
+      title: `UR v${"1.27.5"}`,
       color: "professionalBlue",
       defaultTab: "general",
       children: tabs
@@ -372592,7 +372957,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.27.4") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.27.5") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -372619,7 +372984,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "1.27.4")
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.27.4") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "1.27.5") {
   if (process.env.USER_TYPE === "ant") {
     const changelog = "";
     if (changelog) {
@@ -373789,7 +374154,7 @@ function getRecentActivitySync() {
   return cachedActivity;
 }
 function getLogoDisplayData() {
-  const version2 = process.env.DEMO_VERSION ?? "1.27.4";
+  const version2 = process.env.DEMO_VERSION ?? "1.27.5";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/ur" : getDisplayPath(getCwd2());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -374578,7 +374943,7 @@ function LogoV2() {
   if ($3[2] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = () => {
       const currentConfig = getGlobalConfig();
-      if (currentConfig.lastReleaseNotesSeen === "1.27.4") {
+      if (currentConfig.lastReleaseNotesSeen === "1.27.5") {
         return;
       }
       saveGlobalConfig(_temp326);
@@ -375263,12 +375628,12 @@ function LogoV2() {
   return t41;
 }
 function _temp326(current) {
-  if (current.lastReleaseNotesSeen === "1.27.4") {
+  if (current.lastReleaseNotesSeen === "1.27.5") {
     return current;
   }
   return {
     ...current,
-    lastReleaseNotesSeen: "1.27.4"
+    lastReleaseNotesSeen: "1.27.5"
   };
 }
 function _temp243(s_0) {
@@ -392257,7 +392622,7 @@ function buildToolUseContext(tools, readFileStateCache) {
 async function handleInitialize() {
   return {
     name: "ur-agent",
-    version: "1.27.4",
+    version: "1.27.5",
     protocolVersion: "0.1.0"
   };
 }
@@ -591251,7 +591616,7 @@ async function captureMemoryDiagnostics(trigger2, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "1.27.4"
+    ccVersion: "1.27.5"
   };
 }
 async function performHeapDump(trigger2 = "manual", dumpNumber = 0) {
@@ -591837,7 +592202,7 @@ var init_bridge_kick = __esm(() => {
 var call136 = async () => {
   return {
     type: "text",
-    value: "1.27.4"
+    value: "1.27.5"
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -594697,64 +595062,6 @@ var init_export2 = __esm(() => {
 });
 
 // src/components/ProviderFirstModelPicker.tsx
-function getStatusFromDoctorResult(doctorResult) {
-  if (doctorResult.ok) {
-    return "connected";
-  }
-  if (doctorResult.failureReason?.includes("CLI missing") || doctorResult.failureReason?.includes("not found")) {
-    return "missing";
-  }
-  if (doctorResult.failureReason?.includes("not logged in") || doctorResult.failureReason?.includes("not authenticated")) {
-    return "unavailable";
-  }
-  if (doctorResult.failureReason?.includes("API key missing") || doctorResult.failureReason?.includes("endpoint")) {
-    return "unavailable";
-  }
-  return "unknown";
-}
-function getCredentialType(provider) {
-  switch (provider.authMode) {
-    case "subscription":
-      return "cli-login";
-    case "enterprise-login":
-    case "personal-login":
-      return "cli-login";
-    case "api":
-      return "api-key";
-    case "local":
-      return provider.endpointKind ? "openai-compatible-endpoint" : "local-runtime";
-    default:
-      return "unknown";
-  }
-}
-function formatStatusMessage(status2, provider, checks4) {
-  switch (status2) {
-    case "connected":
-      if (provider.accessType === "api") {
-        const envKey = provider.envKey;
-        if (envKey) {
-          return `${envKey} found`;
-        }
-      }
-      if (provider.accessType === "local" || provider.accessType === "subscription") {
-        return "connected";
-      }
-      return "available";
-    case "missing":
-      if (provider.commandCandidates) {
-        return `CLI not found (tried: ${provider.commandCandidates.join(", ")})`;
-      }
-      return "CLI not found";
-    case "unavailable":
-      const failCheck = checks4.find((c4) => c4.status === "fail" || c4.status === "warn");
-      if (failCheck) {
-        return failCheck.message;
-      }
-      return "not available";
-    case "unknown":
-      return "status unknown";
-  }
-}
 function ProviderFirstModelPicker({
   initial,
   onSelect,
@@ -594773,28 +595080,30 @@ function ProviderFirstModelPicker({
   const [loadingModels, setLoadingModels] = import_react188.useState(false);
   const [selectedProvider, setSelectedProvider] = import_react188.useState(null);
   const [modelSource, setModelSource] = import_react188.useState("static");
-  const isFastMode = useAppState(selectFastMode2);
+  const [modelWarning, setModelWarning] = import_react188.useState(null);
   const effortValue = useAppState(selectEffortValue2);
-  const [effort, setEffort] = import_react188.useState(effortValue !== undefined ? convertEffortValueToLevel(effortValue) : undefined);
+  const [effort] = import_react188.useState(effortValue !== undefined ? convertEffortValueToLevel(effortValue) : undefined);
   const appThinkingEnabled = useAppState(selectThinkingEnabled2);
-  const [hasToggledThinking, setHasToggledThinking] = import_react188.useState(false);
-  const [thinkingEnabled, setThinkingEnabled] = import_react188.useState(() => appThinkingEnabled ?? shouldEnableThinkingByDefault());
+  const hasToggledThinking = false;
+  const [thinkingEnabled] = import_react188.useState(() => appThinkingEnabled ?? shouldEnableThinkingByDefault());
   import_react188.useEffect(() => {
     async function loadProviderStatus() {
       setLoadingProviders(true);
       const providers = listProviders();
+      const settings = getSettingsForSource("userSettings");
       const options2 = await Promise.all(providers.map(async (provider) => {
-        const settings = getSettingsForSource("userSettings");
-        const doctorResult = await doctorProvider(provider.id, { settings });
-        const status2 = getStatusFromDoctorResult(doctorResult);
-        const credentialType = getCredentialType(provider);
+        const status2 = await getProviderStatus(provider.id, {
+          settings: settings ?? undefined
+        });
+        const accessType = getProviderAccessTypeLabel(provider);
         return {
           value: provider.id,
           label: provider.displayName,
-          description: `${capitalize_default(provider.accessType)} \xB7 ${formatStatusMessage(status2, provider, doctorResult.checks)}`,
-          status: status2,
-          accessType: provider.accessType,
-          credentialType,
+          description: `${accessType} \xB7 ${status2.label}`,
+          status: status2.status,
+          statusLabel: status2.label,
+          accessType,
+          credentialType: provider.credentialType,
           provider
         };
       }));
@@ -594808,49 +595117,22 @@ function ProviderFirstModelPicker({
       return;
     async function loadModels() {
       setLoadingModels(true);
+      setModelWarning(null);
       const providerId = selectedProvider.value;
-      const isLocalProvider = ["ollama", "lmstudio", "llama.cpp", "vllm"].includes(providerId);
-      try {
-        if (isLocalProvider) {
-          const controller = new AbortController;
-          const options2 = await getOllamaModelOptions(controller.signal);
-          setModelOptions(options2);
-          setModelSource("live");
-          controller.abort();
-        } else {
-          const models = listModelsForProvider(providerId);
-          if (models.length > 0) {
-            const hasDynamic = models.some((m) => m.isDynamic);
-            if (hasDynamic) {
-              const controller = new AbortController;
-              const options2 = await getOllamaModelOptions(controller.signal);
-              setModelOptions(options2);
-              setModelSource("live");
-              controller.abort();
-            } else {
-              const options2 = models.map((model) => ({
-                value: model.id,
-                label: model.displayName,
-                description: model.description
-              }));
-              setModelOptions(options2);
-              setModelSource("static");
-            }
-          } else {
-            setModelOptions([]);
-            setModelSource("static");
-          }
-        }
-      } catch (error40) {
-        const models = listModelsForProvider(providerId);
-        const options2 = models.filter((m) => !m.isDynamic).map((model) => ({
-          value: model.id,
-          label: model.displayName,
-          description: `${model.description} (cached)`
-        }));
-        setModelOptions(options2);
-        setModelSource("cache");
-      }
+      const controller = new AbortController;
+      const result = await listModelsForProviderWithSource(providerId, {
+        settings: getSettingsForSource("userSettings") ?? undefined,
+        signal: controller.signal
+      });
+      controller.abort();
+      const options2 = result.models.map((model) => ({
+        value: model.id,
+        label: model.displayName,
+        description: `${model.description} \xB7 ${result.source}`
+      }));
+      setModelOptions(options2);
+      setModelSource(result.source);
+      setModelWarning(result.warning ?? null);
       setLoadingModels(false);
     }
     loadModels();
@@ -594890,18 +595172,23 @@ function ProviderFirstModelPicker({
       source: modelSource
     });
     if (selectedProvider) {
-      const validation = validateProviderModelCompatibility(selectedProvider.value, value);
+      const validation = validateProviderModelPair(selectedProvider.value, value, {
+        availableModels: modelOptions.map((option22) => option22.value)
+      });
       if (validation.valid === false) {
+        setModelWarning(validation.error);
         return;
       }
     }
     if (selectedProvider) {
-      updateSettingsForSource("userSettings", {
-        provider: {
-          active: selectedProvider.value,
-          model: value
-        }
+      const saveResult = setProviderModel(selectedProvider.value, value, {
+        availableModels: modelOptions.map((option22) => option22.value),
+        modelSource
       });
+      if (!saveResult.ok) {
+        setModelWarning(saveResult.message);
+        return;
+      }
     }
     setAppState((prev) => ({
       ...prev,
@@ -594913,23 +595200,18 @@ function ProviderFirstModelPicker({
       effortValue: effort,
       ...hasToggledThinking ? { thinkingEnabled } : {}
     }));
-    const confirmationParts = [
-      `Provider: ${selectedProvider?.label} (${selectedProvider?.accessType})`,
-      `Model: ${focusedModel?.label || value}`,
-      `Source: ${modelSource}`
-    ];
-    if (effort) {
-      confirmationParts.push(`Effort: ${capitalize_default(effort)}`);
-    }
-    if (thinkingEnabled && focusedModel && modelSupportsThinking(parseUserSpecifiedModel(value))) {
-      confirmationParts.push(`Thinking: on`);
-    }
-    onSelect(value, effort);
+    onSelect(value, effort, selectedProvider ? {
+      providerId: selectedProvider.value,
+      providerName: selectedProvider.label,
+      accessType: selectedProvider.accessType,
+      modelSource
+    } : undefined);
   }
   function handleBack() {
     setStep("provider");
     setSelectedProvider(null);
     setModelOptions([]);
+    setModelWarning(null);
   }
   if (step === "provider") {
     const content2 = /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedBox_default, {
@@ -595006,12 +595288,19 @@ function ProviderFirstModelPicker({
                         /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
                           color: focusedProvider.status === "connected" ? "success" : "error",
                           children: focusedProvider.status
-                        }, undefined, false, undefined, this)
+                        }, undefined, false, undefined, this),
+                        /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
+                          dimColor: true,
+                          children: [
+                            " \xB7 ",
+                            focusedProvider.statusLabel
+                          ]
+                        }, undefined, true, undefined, this)
                       ]
                     }, undefined, true, undefined, this),
                     /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
                       dimColor: true,
-                      children: focusedProvider.provider.legalPath
+                      children: focusedProvider.provider.accessPathLabel
                     }, undefined, false, undefined, this),
                     focusedProvider.status !== "connected" && /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
                       dimColor: true,
@@ -595081,6 +595370,14 @@ function ProviderFirstModelPicker({
                   ")"
                 ]
               }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
+                dimColor: true,
+                color: "subtle",
+                children: [
+                  "Model source: ",
+                  modelSource
+                ]
+              }, undefined, true, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
                 dimColor: true,
                 color: "subtle",
@@ -595138,8 +595435,18 @@ function ProviderFirstModelPicker({
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
+              modelWarning && /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedBox_default, {
+                marginBottom: 1,
+                flexDirection: "column",
+                children: /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
+                  dimColor: true,
+                  color: "error",
+                  children: modelWarning
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
               modelOptions.length === 0 && /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedBox_default, {
                 marginBottom: 1,
+                flexDirection: "column",
                 children: [
                   /* @__PURE__ */ jsx_dev_runtime346.jsxDEV(ThemedText, {
                     dimColor: true,
@@ -595188,14 +595495,12 @@ function ProviderFirstModelPicker({
   }, undefined, false, undefined, this);
 }
 function noop8() {}
-var import_react188, jsx_dev_runtime346, selectCurrentProvider = (s) => s.provider?.active ?? "ollama", selectEffortValue2 = (s) => s.effortValue, selectFastMode2 = (s) => false, selectThinkingEnabled2 = (s) => s.thinkingEnabled;
+var import_react188, jsx_dev_runtime346, selectCurrentProvider = (s) => s.provider?.active ?? "ollama", selectEffortValue2 = (s) => s.effortValue, selectThinkingEnabled2 = (s) => s.thinkingEnabled;
 var init_ProviderFirstModelPicker = __esm(() => {
-  init_capitalize();
   init_analytics();
   init_providerRegistry();
   init_AppState();
   init_settings2();
-  init_ollamaModels();
   init_ink2();
   init_AppState();
   init_ConfigurableShortcutHint();
@@ -595244,7 +595549,7 @@ function ModelPickerWrapper(t0) {
   const handleCancel = t1;
   let t2;
   if ($3[3] !== isFastMode || $3[4] !== mainLoopModel || $3[5] !== onDone || $3[6] !== setAppState) {
-    t2 = function handleSelect2(model, effort) {
+    t2 = function handleSelect2(model, effort, metadata) {
       logEvent("tengu_model_command_menu", {
         action: model,
         from_model: mainLoopModel,
@@ -595255,7 +595560,9 @@ function ModelPickerWrapper(t0) {
         mainLoopModel: model,
         mainLoopModelForSession: null
       }));
-      let message = `Set model to ${source_default.bold(renderModelLabel(model))}`;
+      let message = metadata ? `Selected provider: ${source_default.bold(metadata.providerName)} (${metadata.accessType})
+Selected model: ${source_default.bold(renderModelLabel(model))}
+Model source: ${metadata.modelSource}` : `Set model to ${source_default.bold(renderModelLabel(model))}`;
       if (effort !== undefined) {
         message = message + ` with ${source_default.bold(effort)} effort`;
       }
@@ -595363,10 +595670,28 @@ function SetModelAndClose({
         setModel(null);
         return;
       }
-      if (isKnownAlias(model)) {
-        setModel(model);
+      const currentProvider = getActiveProviderSettings(getInitialSettings()).active ?? "ollama";
+      const providerValidation = validateProviderModelPair(currentProvider, model);
+      if (providerValidation.valid === false) {
+        onDone(`Invalid model for current provider:
+  Selected provider: ${currentProvider}
+  Selected model: ${model}
+  Valid models for ${currentProvider}: ${providerValidation.validModels.join(", ") || "(no models discovered)"}
+  Suggested action: Run /model and choose a model from ${currentProvider}${providerValidation.suggestedModel ? `, or run: ur config set model ${providerValidation.suggestedModel}` : ""}
+  Error: ${providerValidation.error}`, {
+          display: "system"
+        });
+        return;
+      }
+      const saved = setProviderModel(currentProvider, model);
+      if (!saved.ok) {
+        onDone(saved.message, {
+          display: "system"
+        });
         return;
       }
+      setModel(model);
+      return;
       try {
         const {
           valid,
@@ -595418,9 +595743,6 @@ function SetModelAndClose({
   }, [model, onDone, setAppState]);
   return null;
 }
-function isKnownAlias(model) {
-  return MODEL_ALIASES.includes(model.toLowerCase().trim());
-}
 function ismodelO1mUnavailable(model) {
   const m = model.toLowerCase();
   return !checkmodelO1mAccess() && !ismodelO1mMergeEnabled() && m.includes("modelO") && m.includes("[1m]");
@@ -595501,6 +595823,8 @@ var init_model2 = __esm(() => {
   init_model();
   init_modelAllowlist();
   init_validateModel();
+  init_providerRegistry();
+  init_settings2();
   import_compiler_runtime263 = __toESM(require_compiler_runtime(), 1);
   React105 = __toESM(require_react(), 1);
   jsx_dev_runtime347 = __toESM(require_jsx_dev_runtime(), 1);
@@ -595555,7 +595879,7 @@ function ProviderPicker({
   const selectOptions = providers.map((provider) => ({
     value: provider.id,
     label: provider.displayName,
-    description: `${capitalize_default(provider.accessType)} \xB7 ${provider.authMode} auth`
+    description: `${getProviderAccessTypeLabel(provider)} \xB7 ${provider.credentialType}`
   }));
   const visibleCount = Math.min(10, selectOptions.length);
   const hiddenCount = Math.max(0, selectOptions.length - visibleCount);
@@ -595569,14 +595893,17 @@ function ProviderPicker({
       from_provider: currentProvider,
       to_provider: value
     });
-    updateSettingsForSource("userSettings", {
-      provider: { active: value }
-    });
+    const result = setSafeProviderConfig("provider", value);
+    if (!result.ok) {
+      return;
+    }
+    const saved = getActiveProviderSettings(getSettingsForSource("userSettings") ?? {});
     setAppState((prev) => ({
       ...prev,
       provider: {
         ...prev.provider ?? {},
-        active: value
+        active: saved.active ?? value,
+        model: saved.model
       }
     }));
     onSelect(value);
@@ -595642,10 +595969,10 @@ function ProviderPicker({
                 focusedProvider.id,
                 ") \xB7",
                 " ",
-                capitalize_default(focusedProvider.accessType),
+                getProviderAccessTypeLabel(focusedProvider),
                 " \xB7",
                 " ",
-                focusedProvider.legalPath
+                focusedProvider.accessPathLabel
               ]
             }, undefined, true, undefined, this)
           }, undefined, false, undefined, this)
@@ -595682,7 +596009,6 @@ function ProviderPicker({
 function noop9() {}
 var import_react189, jsx_dev_runtime348, selectCurrentProvider2 = (s) => s.provider?.active ?? "ollama";
 var init_ProviderPicker = __esm(() => {
-  init_capitalize();
   init_analytics();
   init_providerRegistry();
   init_AppState();
@@ -595787,7 +596113,7 @@ var jsx_dev_runtime349, call143 = async (onDone, _context, args) => {
     const {
       resolveProviderId: resolveProviderId2,
       setSafeProviderConfig: setSafeProviderConfig2,
-      validateProviderModelCompatibility: validateProviderModelCompatibility4,
+      validateProviderModelCompatibility: validateProviderModelCompatibility2,
       getActiveProviderSettings: getActiveProviderSettings2
     } = await Promise.resolve().then(() => (init_providerRegistry(), exports_providerRegistry));
     const { getInitialSettings: getInitialSettings2 } = await Promise.resolve().then(() => (init_settings2(), exports_settings));
@@ -595801,7 +596127,7 @@ var jsx_dev_runtime349, call143 = async (onDone, _context, args) => {
     const settings = getInitialSettings2();
     const currentModel = getActiveProviderSettings2(settings).model;
     if (currentModel) {
-      const validation = validateProviderModelCompatibility4(resolvedProvider, currentModel);
+      const validation = validateProviderModelCompatibility2(resolvedProvider, currentModel);
       if (validation.valid === false) {
         const validModelsStr = validation.validModels.join(", ") || "(uses dynamic discovery)";
         const suggestedModel = validation.suggestedModel ?? "see available models";
@@ -601756,7 +602082,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version3 = typeof MACRO !== "undefined" ? "1.27.4" : "unknown";
+  const version3 = typeof MACRO !== "undefined" ? "1.27.5" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h2) => h2.sessionCount > 0).map((h2) => h2.name);
   const facets_summary = {
     total: facets.size,
@@ -606033,7 +606359,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION5 = typeof MACRO !== "undefined" ? "1.27.4" : "unknown";
+  VERSION5 = typeof MACRO !== "undefined" ? "1.27.5" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -607238,7 +607564,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes18(16).toString("hex");
-    return join200(getURTempDir(), "bundled-skills", "1.27.4", nonce);
+    return join200(getURTempDir(), "bundled-skills", "1.27.5", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -613528,7 +613854,7 @@ function computeFingerprint(messageText, version3) {
 }
 function computeFingerprintFromMessages(messages) {
   const firstMessageText = extractFirstMessageText(messages);
-  return computeFingerprint(firstMessageText, "1.27.4");
+  return computeFingerprint(firstMessageText, "1.27.5");
 }
 var FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = () => {};
@@ -615394,7 +615720,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText = extractFirstUserMessageText(messages);
-  const fingerprint = computeFingerprint(messageText, "1.27.4");
+  const fingerprint = computeFingerprint(messageText, "1.27.5");
   const attributionHeader = getAttributionHeader(fingerprint);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -620131,7 +620457,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c4) => c4.userInvocable !== false).map((c4) => c4.name),
     apiKeySource: getURHQApiKeyWithSource().source,
     betas: getSdkBetas(),
-    ur_version: "1.27.4",
+    ur_version: "1.27.5",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent) => agent.agentType),
     skills: inputs.skills.filter((s) => s.userInvocable !== false).map((skill2) => skill2.name),
@@ -634759,7 +635085,7 @@ var init_useVoiceEnabled = __esm(() => {
 function getSemverPart(version3) {
   return `${import_semver13.major(version3, { loose: true })}.${import_semver13.minor(version3, { loose: true })}.${import_semver13.patch(version3, { loose: true })}`;
 }
-function useUpdateNotification(updatedVersion, initialVersion = "1.27.4") {
+function useUpdateNotification(updatedVersion, initialVersion = "1.27.5") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react226.useState(() => getSemverPart(initialVersion));
   if (!updatedVersion) {
     return null;
@@ -634808,7 +635134,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "1.27.4";
+    const currentVersion = "1.27.5";
     const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel);
     const isDisabled = isAutoUpdaterDisabled();
@@ -635037,12 +635363,12 @@ function NativeAutoUpdater({
     logEvent("tengu_native_auto_updater_start", {});
     try {
       const maxVersion = await getMaxVersion();
-      if (maxVersion && gt("1.27.4", maxVersion)) {
+      if (maxVersion && gt("1.27.5", maxVersion)) {
         const msg = await getMaxVersionMessage();
         setMaxVersionIssue(msg ?? "affects your version");
       }
       const result = await installLatest(channel);
-      const currentVersion = "1.27.4";
+      const currentVersion = "1.27.5";
       const latencyMs = Date.now() - startTime;
       if (result.lockFailed) {
         logEvent("tengu_native_auto_updater_lock_contention", {
@@ -635179,17 +635505,17 @@ function PackageManagerAutoUpdater(t0) {
       const maxVersion = await getMaxVersion();
       if (maxVersion && latest && gt(latest, maxVersion)) {
         logForDebugging(`PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`);
-        if (gte("1.27.4", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.27.4"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("1.27.5", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"1.27.5"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("1.27.4", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("1.27.5", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.27.4"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"1.27.5"} -> ${latest}`);
       }
     };
     $3[0] = t1;
@@ -635223,7 +635549,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "1.27.4"
+        "1.27.5"
       ]
     }, undefined, true, undefined, this);
     $3[3] = verbose;
@@ -647669,7 +647995,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "1.27.4",
+    version: "1.27.5",
     output_style: {
       name: outputStyleName
     },
@@ -647744,7 +648070,7 @@ function StatusLineInner({
   const taskValues = Object.values(tasks2);
   const taskRunningCount = taskValues.filter((task2) => task2.status === "running" || task2.status === "pending").length;
   const defaultStatusLineText = buildDefaultStatusBar({
-    version: "1.27.4",
+    version: "1.27.5",
     providerLabel: providerRuntime.providerLabel,
     authMode: providerRuntime.authLabel,
     model: providerRuntime.model ?? renderModelName(mainLoopModel),
@@ -659230,7 +659556,7 @@ async function submitTranscriptShare(messages, trigger2, appearanceId) {
     } catch {}
     const data = {
       trigger: trigger2,
-      version: "1.27.4",
+      version: "1.27.5",
       platform: process.platform,
       transcript,
       subagentTranscripts: Object.keys(subagentTranscripts).length > 0 ? subagentTranscripts : undefined,
@@ -671112,7 +671438,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "1.27.4"
+              "1.27.5"
             ]
           }, undefined, true, undefined, this)
         ]
@@ -672372,7 +672698,7 @@ function completeOnboarding() {
   saveGlobalConfig((current) => ({
     ...current,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "1.27.4"
+    lastOnboardingVersion: "1.27.5"
   }));
 }
 function showDialog(root2, renderer) {
@@ -677473,7 +677799,7 @@ function appendToLog(path24, message) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "1.27.4"
+    version: "1.27.5"
   };
   getLogWriter(path24).write(messageWithTimestamp);
 }
@@ -681567,8 +681893,8 @@ async function getEnvLessBridgeConfig() {
 }
 async function checkEnvLessBridgeMinVersion() {
   const cfg = await getEnvLessBridgeConfig();
-  if (cfg.min_version && lt("1.27.4", cfg.min_version)) {
-    return `Your version of UR (${"1.27.4"}) is too old for Remote Control.
+  if (cfg.min_version && lt("1.27.5", cfg.min_version)) {
+    return `Your version of UR (${"1.27.5"}) is too old for Remote Control.
 Version ${cfg.min_version} or higher is required. Run \`ur update\` to update.`;
   }
   return null;
@@ -682042,7 +682368,7 @@ async function initBridgeCore(params) {
   const rawApi = createBridgeApiClient({
     baseUrl,
     getAccessToken,
-    runnerVersion: "1.27.4",
+    runnerVersion: "1.27.5",
     onDebug: logForDebugging,
     onAuth401,
     getTrustedDeviceToken
@@ -687723,7 +688049,7 @@ async function startMCPServer(cwd3, debug2, verbose) {
   setCwd(cwd3);
   const server2 = new Server({
     name: "ur/tengu",
-    version: "1.27.4"
+    version: "1.27.5"
   }, {
     capabilities: {
       tools: {}
@@ -688333,9 +688659,9 @@ async function configSetHandler(key, values2) {
       writeError(`Invalid model for current provider:
   Selected provider: ${currentProvider}
   Selected model: ${value}
-  Error: ${validation.error}
-  Valid models for ${currentProvider}: ${validation.validModels.join(", ") || "(none - uses dynamic discovery)"}${validation.suggestedModel ? `
-  Suggested: ur config set model ${validation.suggestedModel}` : ""}`);
+  Valid models for ${currentProvider}: ${validation.validModels.join(", ") || "(no models discovered)"}
+  Suggested action: Run /model and choose a model from ${currentProvider}${validation.suggestedModel ? `, or run: ur config set model ${validation.suggestedModel}` : ""}
+  Error: ${validation.error}`);
       process.exit(1);
     }
   }
@@ -688349,9 +688675,9 @@ async function configSetHandler(key, values2) {
         if (validation.valid === false) {
           const validModelsStr = validation.validModels.join(", ") || "(uses dynamic discovery)";
           const suggestedModel = validation.suggestedModel ?? "<model-name>";
-          writeError(`Warning: Current model "${currentModel}" is not available for provider "${newProvider}".
+          writeError(`Warning: Current model "${currentModel}" is not available for provider "${newProvider}" and will be cleared.
   Valid models for ${newProvider}: ${validModelsStr}
-  After changing provider, run: ur config set model ${suggestedModel}`);
+  After changing provider, run /model or: ur config set model ${suggestedModel}`);
         }
       }
     }
@@ -689536,7 +689862,7 @@ async function update() {
   logEvent("tengu_update_check", {});
   const diagnostic = await getDoctorDiagnostic();
   const result = await checkUpgradeStatus({
-    currentVersion: "1.27.4",
+    currentVersion: "1.27.5",
     packageName: UR_AGENT_PACKAGE_NAME,
     installationType: diagnostic.installationType,
     latestVersion: () => getLatestNpmPackageVersion(UR_AGENT_PACKAGE_NAME)
@@ -690782,7 +691108,7 @@ ${customInstructions}` : customInstructions;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "1.27.4",
+      version: "1.27.5",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -691566,7 +691892,7 @@ Usage: ur --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("1.27.4 (UR-AGENT)", "-v, --version", "Output the version number");
+  }).version("1.27.5 (UR-AGENT)", "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -692443,7 +692769,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"1.27.4"} (UR-AGENT)`);
+    console.log(`${"1.27.5"} (UR-AGENT)`);
     return;
   }
   if (args[0] === "a2a" && args[1] === "serve" && !args.includes("--help") && !args.includes("-h")) {