Update hermes_cli/runtime_provider.py

hermes_cli/runtime_provider.py

@@ -89,6 +89,20 @@ def _get_model_config() -> Dict[str, Any]:
     return {}
 
 
+def _model_config_with_target(target_model: Optional[str] = None) -> Dict[str, Any]:
+    """Return model config, optionally overriding the runtime model name.
+
+    External callers such as hermes-web-ui may resolve credentials for a
+    specific chat model without persisting that model into config.yaml.
+    """
+    model_cfg = _get_model_config()
+    target = str(target_model or "").strip()
+    if target:
+        model_cfg = dict(model_cfg)
+        model_cfg["default"] = target
+    return model_cfg
+
+
 def _provider_supports_explicit_api_mode(provider: Optional[str], configured_provider: Optional[str] = None) -> bool:
     """Check whether a persisted api_mode should be honored for a given provider.
 
@@ -287,6 +301,8 @@ def _get_named_custom_provider(requested_provider: str) -> Optional[Dict[str, An
             # Resolve the API key from the env var name stored in key_env
             key_env = str(entry.get("key_env", "") or "").strip()
             resolved_api_key = os.getenv(key_env, "").strip() if key_env else ""
+            configured_api_key = str(entry.get("api_key", "") or "").strip()
+            resolved_api_key = resolved_api_key or configured_api_key
 
             if requested_norm in {ep_name, name_norm, f"custom:{name_norm}"}:
                 # Found match by provider key
@@ -419,8 +435,9 @@ def _resolve_openrouter_runtime(
     requested_provider: str,
     explicit_api_key: Optional[str] = None,
     explicit_base_url: Optional[str] = None,
+    target_model: Optional[str] = None,
 ) -> Dict[str, Any]:
-    model_cfg = _get_model_config()
+    model_cfg = _model_config_with_target(target_model)
     cfg_base_url = model_cfg.get("base_url") if isinstance(model_cfg.get("base_url"), str) else ""
     cfg_provider = model_cfg.get("provider") if isinstance(model_cfg.get("provider"), str) else ""
     cfg_api_key = ""
@@ -474,8 +491,8 @@ def _resolve_openrouter_runtime(
             (cfg_api_key if use_config_base_url else ""),
             (os.getenv("OLLAMA_API_KEY") if _is_ollama_url else ""),
             os.getenv("OPENAI_API_KEY"),
-            os.getenv("OPENROUTER_API_KEY"),
         ]
+        api_key_candidates.append(os.getenv("OPENROUTER_API_KEY"))
     api_key = next(
         (str(candidate or "").strip() for candidate in api_key_candidates if has_usable_secret(candidate)),
         "",
@@ -648,10 +665,12 @@ def resolve_runtime_provider(
     requested: Optional[str] = None,
     explicit_api_key: Optional[str] = None,
     explicit_base_url: Optional[str] = None,
+    target_model: Optional[str] = None,
 ) -> Dict[str, Any]:
     """Resolve runtime provider credentials for agent execution."""
     requested_provider = resolve_requested_provider(requested)
 
+    model_cfg = _model_config_with_target(target_model)
     custom_runtime = _resolve_named_custom_runtime(
         requested_provider=requested_provider,
         explicit_api_key=explicit_api_key,
@@ -666,7 +685,6 @@ def resolve_runtime_provider(
         explicit_api_key=explicit_api_key,
         explicit_base_url=explicit_base_url,
     )
-    model_cfg = _get_model_config()
     explicit_runtime = _resolve_explicit_runtime(
         provider=provider,
         requested_provider=requested_provider,
@@ -878,6 +896,7 @@ def resolve_runtime_provider(
         requested_provider=requested_provider,
         explicit_api_key=explicit_api_key,
         explicit_base_url=explicit_base_url,
+        target_model=target_model,
     )
     runtime["requested_provider"] = requested_provider
     return runtime