feat: add Ollama Cloud as a declarative provider

Add ollama_cloud.json using the OpenAI-compatible engine with dynamic
model discovery via /v1/models. Preserve oauth/device-code fields when
rewriting declarative provider config keys.

Co-developed-by: Michael Neale <michael@michaelneale.com>

Author: vincenzopalazzo

crates/goose/src/providers/declarative/ollama_cloud.json

@@ -0,0 +1,13 @@
+{
+  "name": "ollama_cloud",
+  "engine": "openai",
+  "display_name": "Ollama Cloud",
+  "description": "Access hosted models on ollama.com via OpenAI-compatible API",
+  "api_key_env": "OLLAMA_CLOUD_API_KEY",
+  "base_url": "https://ollama.com/v1/chat/completions",
+  "models": [],
+  "dynamic_models": true,
+  "headers": null,
+  "timeout_seconds": null,
+  "supports_streaming": true
+}

crates/goose/src/providers/provider_registry.rs

@@ -112,20 +112,22 @@ impl ProviderRegistry {
             if !config.requires_auth {
                 config_keys.remove(api_key_index);
             } else if !config.api_key_env.is_empty() {
+                let original = &config_keys[api_key_index];
                 let api_key_required = provider_type == ProviderType::Declarative;
-                config_keys[api_key_index] = super::base::ConfigKey::new(
-                    &config.api_key_env,
-                    api_key_required,
-                    true,
-                    None,
-                    true,
-                );
+                config_keys[api_key_index] = super::base::ConfigKey {
+                    name: config.api_key_env.clone(),
+                    required: api_key_required,
+                    secret: true,
+                    default: None,
+                    oauth_flow: original.oauth_flow,
+                    device_code_flow: original.device_code_flow,
+                    primary: original.primary,
+                };
             }
         }
 
         if let Some(ref env_vars) = config.env_vars {
             for ev in env_vars {
-                // Default primary to `required` so required fields show prominently in the UI
                 let primary = ev.primary.unwrap_or(ev.required);
                 config_keys.push(super::base::ConfigKey::new(
                     &ev.name,
@@ -204,3 +206,54 @@ impl ProviderRegistry {
         self.entries.retain(|name, _| !name.starts_with("custom_"));
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::config::declarative_providers::ProviderEngine;
+    use crate::providers::openai::OpenAiProvider;
+
+    #[test]
+    fn register_with_name_rewrites_secret_key_for_declarative_provider() {
+        let mut registry = ProviderRegistry::new();
+        let config = DeclarativeProviderConfig {
+            name: "ollama_cloud".to_string(),
+            engine: ProviderEngine::OpenAI,
+            display_name: "Ollama Cloud".to_string(),
+            description: None,
+            api_key_env: "OLLAMA_CLOUD_API_KEY".to_string(),
+            base_url: "https://ollama.com/v1/chat/completions".to_string(),
+            models: vec![],
+            headers: None,
+            timeout_seconds: None,
+            supports_streaming: Some(true),
+            requires_auth: true,
+            catalog_provider_id: None,
+            base_path: None,
+            env_vars: None,
+            dynamic_models: None,
+            skip_canonical_filtering: false,
+            fast_model: None,
+        };
+
+        registry.register_with_name::<OpenAiProvider, _>(
+            &config,
+            ProviderType::Declarative,
+            |_model| unreachable!("constructor is not used in metadata tests"),
+        );
+
+        let entry = registry
+            .entries
+            .get("ollama_cloud")
+            .expect("declarative provider should be registered");
+        let api_key = entry
+            .metadata
+            .config_keys
+            .iter()
+            .find(|key| key.secret)
+            .expect("declarative provider should expose a secret config key");
+
+        assert_eq!(api_key.name, "OLLAMA_CLOUD_API_KEY");
+        assert!(api_key.required);
+    }
+}

documentation/docs/getting-started/providers.md

@@ -38,6 +38,7 @@ goose is compatible with a wide range of LLM providers, allowing you to choose a
 | [LM Studio](https://lmstudio.ai/)                                          | Run local models with LM Studio's OpenAI-compatible server. **Because this provider runs locally, you must first [download a model](#local-llms).**                                                           | None required. Connects to local server at `localhost:1234` by default.                                                                                                             |
 | [Mistral AI](https://mistral.ai/)                                           | Provides access to Mistral models including general-purpose models, specialized coding models (Codestral), and multimodal models (Pixtral).                                                                   | `MISTRAL_API_KEY`                                                                                                 |
 | [Ollama](https://ollama.com/)                                               | Local model runner supporting Qwen, Llama, DeepSeek, and other open-source models. **Because this provider runs locally, you must first [download and run a model](#local-llms).**  | `OLLAMA_HOST`                                                                                                                                                                       |
+| [Ollama Cloud](https://ollama.com/)                                         | Access hosted models on ollama.com via OpenAI-compatible API. Requires an Ollama account and API key.  | `OLLAMA_CLOUD_API_KEY`                                                                                                                                                                       |
 | [OpenAI](https://platform.openai.com/api-keys)                              | Provides gpt-4o, o1, and other advanced language models. Also supports OpenAI-compatible endpoints (e.g., self-hosted LLaMA, vLLM, KServe). **o1-mini and o1-preview are not supported because goose uses tool calling.** | `OPENAI_API_KEY`, `OPENAI_HOST` (optional), `OPENAI_ORGANIZATION` (optional), `OPENAI_PROJECT` (optional), `OPENAI_CUSTOM_HEADERS` (optional)                                       |
 | [OpenRouter](https://openrouter.ai/)                                        | API gateway for unified access to various models with features like rate-limiting management.                                                                                                                             | `OPENROUTER_API_KEY`                                                                                                                                                                |
 | [OVHcloud AI](https://www.ovhcloud.com/en/public-cloud/ai-endpoints/)       | Provides access to open-source models including Qwen, Llama, Mistral, and DeepSeek through AI Endpoints service.                                                       | `OVHCLOUD_API_KEY`                                                                                                                                                                  |
@@ -993,9 +994,10 @@ Here are some local providers we support:
         6. Enter the host where your model is running
 
         :::info Endpoint
-        For Ollama, if you don't provide a host, we set it to `localhost:11434`. 
-        When constructing the URL, we prepend `http://` if the scheme is not `http` or `https`. 
+        For Ollama, if you don't provide a host, we set it to `localhost:11434`.
+        When constructing the URL, we prepend `http://` if the scheme is not `http` or `https`.
         If you're running Ollama on a different server, you'll have to set `OLLAMA_HOST=http://{host}:{port}`.
+        For hosted models on ollama.com, use the **Ollama Cloud** provider instead.
         :::
 
         ```

documentation/docs/guides/context-engineering/using-goosehints.md

@@ -139,6 +139,7 @@ my-project/
 ```
 
 If you start goose in `my-project/`, the root-level hints are loaded immediately. Later, when goose accesses files under `frontend/components/`, it loads the nested hints for that path and combines them in the following order:
+
 1. <details>
      <summary>`my-project/.goosehints` (project root)</summary>
         ```
@@ -151,8 +152,6 @@ If you start goose in `my-project/`, the root-level hints are loaded immediately
         Use conventional commits for all changes.
         ```
    </details>
-
-After nested hints are loaded for a directory, they remain active for the rest of the session. If you update a hint file and want goose to pick up the new content reliably, restart the session.
 2. <details>
      <summary>`frontend/.goosehints`</summary>
         ```
@@ -195,6 +194,10 @@ After nested hints are loaded for a directory, they remain active for the rest o
         ```
    </details>
 
+:::note
+After nested hints are loaded for a directory, they remain active for the rest of the session. If you update a hint file and want goose to pick up the new content reliably, restart the session.
+:::
+
 ## Common Use Cases
 Here are some ways people have used hints to provide additional context to goose:
 

ui/desktop/src/components/settings/providers/subcomponents/utils/StringUtils.tsx

@@ -12,7 +12,8 @@ const i18n = defineMessages({
   },
   ollamaNotConfiguredSuffix: {
     id: 'stringUtils.ollamaNotConfiguredSuffix',
-    defaultMessage: 'must be installed on your machine and open, or you must enter a value for OLLAMA_HOST.',
+    defaultMessage:
+      'must be installed on your machine and open, or you must enter a value for OLLAMA_HOST.',
   },
   configuredProvider: {
     id: 'stringUtils.configuredProvider',

ui/desktop/src/utils/configUtils.ts

@@ -44,6 +44,9 @@ export const configLabels: Record<string, string> = {
   // ollama
   OLLAMA_HOST: 'Ollama Host',
 
+  // ollama cloud
+  OLLAMA_CLOUD_API_KEY: 'Ollama Cloud API Key',
+
   // azure openai
   AZURE_OPENAI_API_KEY: 'Azure OpenAI API Key',
   AZURE_OPENAI_ENDPOINT: 'Azure OpenAI Endpoint',