diff --git a/docs/docs.json b/docs/docs.json index 61d075379..1f7524517 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -96,6 +96,14 @@ "source": "/integrations/clawdbot", "destination": "/integrations/openclaw" }, + { + "source": "/integrations/codex-app", + "destination": "/integrations/chatgpt" + }, + { + "source": "/integrations/codex-app.mdx", + "destination": "/integrations/chatgpt" + }, { "source": "/integrations/poolside", "destination": "/integrations/pool" @@ -171,8 +179,8 @@ "/integrations/opencode", "/integrations/deepseek-harness", "/integrations/cline-cli", - "/integrations/codex-app", "/integrations/codex", + "/integrations/chatgpt", "/integrations/copilot-cli", "/integrations/droid", "/integrations/goose", diff --git a/docs/integrations/chatgpt.mdx b/docs/integrations/chatgpt.mdx new file mode 100644 index 000000000..3c1d75b27 --- /dev/null +++ b/docs/integrations/chatgpt.mdx @@ -0,0 +1,39 @@ +--- +title: ChatGPT Desktop +description: Use Ollama models in ChatGPT Desktop. +--- + +ChatGPT Desktop includes Codex, OpenAI's desktop coding agent. Ollama adds compatible local and cloud models to Codex's model picker alongside ChatGPT's native models. + +## Prerequisites + +- Ollama v0.34.0 or newer + +If ChatGPT is not installed, Ollama offers to download it during setup. + +## Connect ChatGPT + +1. Open the Ollama desktop app and select **Apps**. +2. Toggle **ChatGPT (Desktop)** to On. +3. Follow the setup prompts. If ChatGPT is already open, Ollama asks to restart it before the new models appear. +4. Open the ChatGPT desktop app and use Codex mode. + +## Choose models + +Open Ollama **Settings**, select **Apps**, then select ChatGPT. Choose up to five compatible local or cloud models and save your changes. Ollama asks to restart ChatGPT when a model change needs one. + +## Disconnect ChatGPT + +Open Ollama **Apps** and turn ChatGPT off. Ollama restores ChatGPT's connection settings and usual profile. If ChatGPT is open, Ollama asks to restart it so the change takes effect. + +## Codex behavior and limits + +- Only requests made with an Ollama model go to Ollama. ChatGPT's native models keep using their usual provider. +- Ollama models are for Codex mode. Regular Chat and voice keep using their usual ChatGPT connection. +- Codex manages sessions. Ollama routes model requests and compaction when Codex asks for it, but does not store ChatGPT sessions. +- Web search uses Ollama's web-search service when you use an Ollama model. It requires Ollama sign-in and is limited to three calls per response. + +## Related integrations + +- Use Codex from a terminal with [Codex CLI](/integrations/codex). +- Connect other desktop apps from [Claude Desktop](/integrations/claude-desktop). diff --git a/docs/integrations/codex-app.mdx b/docs/integrations/codex-app.mdx deleted file mode 100644 index 13c85e2e7..000000000 --- a/docs/integrations/codex-app.mdx +++ /dev/null @@ -1,82 +0,0 @@ ---- -title: Codex App ---- - -Codex App is OpenAI's desktop coding agent for macOS and Windows. Ollama configures the app to use Ollama's OpenAI-compatible endpoint, so Codex can work with local models and Ollama Cloud models in the desktop app. - -Codex App with Ollama selected - -## Install - -Install the [Codex App](https://developers.openai.com/codex/quickstart/) for macOS or Windows. - -Codex App support is available in Ollama v0.24.0 and newer. - - -## Quick setup - -```shell -ollama launch codex-app -``` - -Once Codex App opens, start a task or open a repository as usual. - -## Built-in browser - -Codex App can open local servers and sites in its built-in browser. Annotate directly on the page to request changes. - -Codex App browser annotations - -## Review mode - -Use review mode to inspect code changes, leave comments, and iterate on fixes without leaving the app. - -Codex App review comments - -### Run directly with a model - -```shell -ollama launch codex-app --model kimi-k2.6:cloud -``` - -Use a local model by passing its model name: - -```shell -ollama launch codex-app --model gemma4:31b -``` - -Running `ollama launch codex-app` is persistent and will have your model selected next time you open Codex. - - -### Restore Codex App - -To switch Codex App back to the profile you were using before `ollama launch codex-app`, run: - -```shell -ollama launch codex-app --restore -``` - -Ollama restores Codex App's settings and configs. If Codex App is open, Ollama asks before restarting it. - - -The Codex CLI profile managed by `ollama launch codex` is left separate from the Codex App profile. - -Before overwriting Codex App config files, Ollama Launch saves backups under `~/.ollama/backup/codex-app/`. On Windows, `~` resolves to your user profile directory. - -## Troubleshooting - -If Codex App does not open after setup, open Codex manually once and run `ollama launch codex-app` again. - -If Codex App is already running and does not switch models, allow Ollama to restart it when prompted, or quit Codex App and run `ollama launch codex-app` again. diff --git a/docs/integrations/codex.mdx b/docs/integrations/codex.mdx index 93ff3b031..18812a61c 100644 --- a/docs/integrations/codex.mdx +++ b/docs/integrations/codex.mdx @@ -5,7 +5,7 @@ title: Codex CLI ## Install -Install the [Codex CLI](https://developers.openai.com/codex/cli/). For the desktop app, see [Codex App](/integrations/codex-app). +Install the [Codex CLI](https://developers.openai.com/codex/cli/). For the ChatGPT desktop app, see [ChatGPT Desktop](/integrations/chatgpt). ``` npm install -g @openai/codex diff --git a/docs/integrations/index.mdx b/docs/integrations/index.mdx index c7b67ddd9..8bfa4ae35 100644 --- a/docs/integrations/index.mdx +++ b/docs/integrations/index.mdx @@ -32,6 +32,10 @@ Use open models in assistant apps. Desktop assistant with local and cloud Ollama models. + + Use Ollama models in Codex inside ChatGPT Desktop. + + Personal assistant for messaging apps and everyday tasks.