From 1435fce2debe00a4973ddeaad4aa7c3b23020045 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 11 Mar 2026 14:51:56 +0000 Subject: [PATCH] fix: tighten Ollama onboarding cloud handling (#41529) (thanks @BruceMacD) --- CHANGELOG.md | 1 + src/commands/ollama-setup.ts | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ca52a6e9ab..ab831a6d5ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Docs: https://docs.openclaw.ai - macOS/chat UI: add a chat model picker, persist explicit thinking-level selections across relaunch, and harden provider-aware session model sync for the shared chat composer. (#42314) Thanks @ImLukeF. - iOS/TestFlight: add a local beta release flow with Fastlane prepare/archive/upload support, canonical beta bundle IDs, and watch-app archive fixes. (#42991) Thanks @ngutman. - macOS/onboarding: detect when remote gateways need a shared auth token, explain where to find it on the gateway host, and clarify when a successful check used paired-device auth instead. (#43100) Thanks @ngutman. +- Onboarding/Ollama: add first-class Ollama setup with Local or Cloud + Local modes, browser-based cloud sign-in, curated model suggestions, and cloud-model handling that skips unnecessary local pulls. (#41529) Thanks @BruceMacD. ### Breaking diff --git a/src/commands/ollama-setup.ts b/src/commands/ollama-setup.ts index 7bffaf729e5..7af3e18cff1 100644 --- a/src/commands/ollama-setup.ts +++ b/src/commands/ollama-setup.ts @@ -17,11 +17,7 @@ export { OLLAMA_DEFAULT_BASE_URL } from "../agents/ollama-models.js"; export const OLLAMA_DEFAULT_MODEL = "glm-4.7-flash"; const OLLAMA_SUGGESTED_MODELS_LOCAL = ["glm-4.7-flash"]; -const OLLAMA_SUGGESTED_MODELS_CLOUD = [ - "kimi-k2.5:cloud", - "minimax-m2.5:cloud", - "glm-5:cloud", -]; +const OLLAMA_SUGGESTED_MODELS_CLOUD = ["kimi-k2.5:cloud", "minimax-m2.5:cloud", "glm-5:cloud"]; function normalizeOllamaModelName(value: string | undefined): string | undefined { const trimmed = value?.trim(); @@ -455,7 +451,10 @@ export async function configureOllamaNonInteractive(params: { let allModelNames = orderedModelNames; let defaultModelId = requestedDefaultModelId; - if ((pulledRequestedModel || requestedCloudModel) && !allModelNames.includes(requestedDefaultModelId)) { + if ( + (pulledRequestedModel || requestedCloudModel) && + !allModelNames.includes(requestedDefaultModelId) + ) { allModelNames = [...allModelNames, requestedDefaultModelId]; } if (!availableModelNames.has(requestedDefaultModelId)) {