github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-06 16:11:34 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #15776] [MERGED] launch: resave managed integration config when live config drifts #77598

New Issue
Closed
opened 2026-05-05 10:16:00 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-05 10:16:00 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/15776
Author: @hoyyeva
Created: 4/23/2026
Status: ✅ Merged
Merged: 4/23/2026
Merged by: @hoyyeva

Base: main ← Head: hoyyeva/fix-launch-stale-config-save

📝 Commits (2)

  • 833f1d5 launch: resave managed integration config when live config drifts
  • 8a5b37e fix test

📊 Changes

2 files changed (+60 additions, -1 deletions)

View changed files

📝 cmd/launch/launch.go (+1 -1)
📝 cmd/launch/launch_test.go (+59 -0)

📄 Description

Summary

Fixes a launcher bug for managed integrations like Hermes where the integration's live config could drift from Ollama's saved config.

Before this change, a normal launch could use the drifted live integration config successfully, but skip rewriting Ollama's saved config. That left ~/.ollama/config.json stale even though the integration was already running the updated model.

What changed

  • Update the managed integration launch path to rewrite when the saved Ollama config does not match the resolved target model, even if the live integration config already matches.
  • Add a regression test covering the stale-save scenario:
    • saved launcher config points to model A
    • live managed integration config points to model B
    • normal launch reconciles and persists model B

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/15776 **Author:** [@hoyyeva](https://github.com/hoyyeva) **Created:** 4/23/2026 **Status:** ✅ Merged **Merged:** 4/23/2026 **Merged by:** [@hoyyeva](https://github.com/hoyyeva) **Base:** `main` ← **Head:** `hoyyeva/fix-launch-stale-config-save` --- ### 📝 Commits (2) - [`833f1d5`](https://github.com/ollama/ollama/commit/833f1d5a3d415cdb58374a11cb0e1c263571d8c9) launch: resave managed integration config when live config drifts - [`8a5b37e`](https://github.com/ollama/ollama/commit/8a5b37e0ac2b4fc64a7fc096fc08782e96ffd0af) fix test ### 📊 Changes **2 files changed** (+60 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `cmd/launch/launch.go` (+1 -1) 📝 `cmd/launch/launch_test.go` (+59 -0) </details> ### 📄 Description ## Summary Fixes a launcher bug for managed integrations like Hermes where the integration's live config could drift from Ollama's saved config. Before this change, a normal launch could use the drifted live integration config successfully, but skip rewriting Ollama's saved config. That left `~/.ollama/config.json` stale even though the integration was already running the updated model. ## What changed - Update the managed integration launch path to rewrite when the saved Ollama config does not match the resolved target model, even if the live integration config already matches. - Add a regression test covering the stale-save scenario: - saved launcher config points to model A - live managed integration config points to model B - normal launch reconciles and persists model B --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-05 10:16:00 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#77598
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?