Skip to content

Commit 1435fce

Browse files
committed
fix: tighten Ollama onboarding cloud handling (openclaw#41529) (thanks @BruceMacD)
1 parent d6108a6 commit 1435fce

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Docs: https://docs.openclaw.ai
1717
- 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.
1818
- 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.
1919
- 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.
20+
- 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.
2021

2122
### Breaking
2223

src/commands/ollama-setup.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ export { OLLAMA_DEFAULT_BASE_URL } from "../agents/ollama-models.js";
1717
export const OLLAMA_DEFAULT_MODEL = "glm-4.7-flash";
1818

1919
const OLLAMA_SUGGESTED_MODELS_LOCAL = ["glm-4.7-flash"];
20-
const OLLAMA_SUGGESTED_MODELS_CLOUD = [
21-
"kimi-k2.5:cloud",
22-
"minimax-m2.5:cloud",
23-
"glm-5:cloud",
24-
];
20+
const OLLAMA_SUGGESTED_MODELS_CLOUD = ["kimi-k2.5:cloud", "minimax-m2.5:cloud", "glm-5:cloud"];
2521

2622
function normalizeOllamaModelName(value: string | undefined): string | undefined {
2723
const trimmed = value?.trim();
@@ -455,7 +451,10 @@ export async function configureOllamaNonInteractive(params: {
455451

456452
let allModelNames = orderedModelNames;
457453
let defaultModelId = requestedDefaultModelId;
458-
if ((pulledRequestedModel || requestedCloudModel) && !allModelNames.includes(requestedDefaultModelId)) {
454+
if (
455+
(pulledRequestedModel || requestedCloudModel) &&
456+
!allModelNames.includes(requestedDefaultModelId)
457+
) {
459458
allModelNames = [...allModelNames, requestedDefaultModelId];
460459
}
461460
if (!availableModelNames.has(requestedDefaultModelId)) {

0 commit comments

Comments
 (0)