upstream-archive/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-09-21 13:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

app: preserve Codex configuration across host changes (#18247)

Browse Source
This commit is contained in:
Parth Sareen
2026-09-08 12:42:37 -07:00
committed by GitHub
parent 3b5ab1fcfc
commit 9ef6c19341
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/launch/codex_app.go
+5 -2
View File
@@ -159,7 +159,9 @@ func (c *CodexApp) CurrentModel() string {
if err != nil {
return ""
}
if codexAppRootUsesProxy(parsed) && codexAppCatalogHealthy(parsed, "") {
if codexAppRootUsesProxy(parsed) &&
codexNormalizeURL(parsed.RootString(codexRootOpenAIBaseURLKey)) == codexNormalizeURL(codexAppProxyBaseURL()) &&
codexAppCatalogHealthy(parsed, "") {
model := strings.TrimSpace(parsed.RootString(codexRootModelKey))
if codexAppCatalogContainsModel(model) {
return model
@@ -2307,7 +2309,8 @@ func codexAppManagedProxyURL(raw string) bool {
return false
}
}
return strings.TrimSuffix(u.Path, "/") == proxy.CodexDesktopPathPrefix+"/v1"
// ConnectableHost preserves proxy path prefixes from OLLAMA_HOST.
return strings.HasSuffix(strings.TrimSuffix(u.Path, "/"), proxy.CodexDesktopPathPrefix+"/v1")
}
func codexAppRootReferencesCatalog(text string) bool {
cmd/launch/codex_app_test.go
+40 -3
View File
@@ -1558,6 +1558,25 @@ func TestCodexAppConfigureUsesConnectableHostForUnspecifiedBindAddress(t *testin
}
func TestCodexAppHostChangePreservesRestoreState(t *testing.T) {
for _, host := range []string{
"http://127.0.0.1:11434",
"http://localhost:11434",
"http://localhost:11434/ollama",
"http://127.0.0.1:11434/ollama",
"http://[::1]:11434/ollama",
} {
t.Run(host, func(t *testing.T) {
t.Run("restore", func(t *testing.T) {
testCodexAppHostChangePreservesRestoreState(t, host, false)
})
t.Run("reconfigure then restore", func(t *testing.T) {
testCodexAppHostChangePreservesRestoreState(t, host, true)
})
})
}
}
func testCodexAppHostChangePreservesRestoreState(t *testing.T, host string, reconfigure bool) {
tmpDir := t.TempDir()
setTestHome(t, tmpDir)
withCodexAppPlatform(t, "darwin")
@@ -1575,11 +1594,17 @@ func TestCodexAppHostChangePreservesRestoreState(t *testing.T) {
t.Fatal(err)
}
t.Setenv("OLLAMA_HOST", "http://127.0.0.1:11434")
t.Setenv("OLLAMA_HOST", host)
app := &CodexApp{}
if err := app.ConfigureWithModels("llama3.2", testLaunchModels("llama3.2")); err != nil {
t.Fatalf("initial ConfigureWithModels returned error: %v", err)
}
if !app.OllamaConfigured() {
t.Fatal("generated configuration is not recognized as owned")
}
if got := app.CurrentModel(); got != "llama3.2" {
t.Fatalf("CurrentModel after setup = %q, want llama3.2", got)
}
// A changed server address must not make the off-switch disappear or cause
// the next update to save Ollama's managed root as the user's restore target.
@@ -1587,8 +1612,20 @@ func TestCodexAppHostChangePreservesRestoreState(t *testing.T) {
if !app.OllamaConfigured() {
t.Fatal("OllamaConfigured = false after host change, want managed config to remain detectable")
}
if err := app.ConfigureWithModels("gemma4", testLaunchModels("gemma4")); err != nil {
t.Fatalf("updated ConfigureWithModels returned error: %v", err)
if got := app.CurrentModel(); got != "" {
t.Fatalf("CurrentModel after host change = %q, want empty to require launcher reconfiguration", got)
}
if reconfigure {
if err := app.ConfigureWithModels("gemma4", testLaunchModels("gemma4")); err != nil {
t.Fatalf("updated ConfigureWithModels returned error: %v", err)
}
updated, err := os.ReadFile(configPath)
if err != nil {
t.Fatal(err)
}
if got := codexRootStringValue(string(updated), codexRootOpenAIBaseURLKey); got != "http://127.0.0.1:22434/api/codex/v1" {
t.Fatalf("updated endpoint = %q, want current host", got)
}
}
if err := app.RestoreFromDesktop(false); err != nil {
t.Fatalf("RestoreFromDesktop returned error: %v", err)