From 8e49f89f0d3f98eb56a951a1d826c362d5097b6c Mon Sep 17 00:00:00 2001 From: euxaristia <25621994+euxaristia@users.noreply.github.com> Date: Tue, 7 Jul 2026 21:56:06 -0400 Subject: [PATCH 1/2] test(config): make Resolve local-control tests env-independent Resolve reads ZERO_PROVIDER from the environment via applyEnv, then fails with "no active provider configured" when that provider is not present in the config. This made TestResolveLocalControlFromUserConfig, TestResolveLocalControlIgnoresProjectOptIn, TestLocalControlDefaultsBrowserAndTerminalOn, and TestLocalControlExplicitGlobalDisable fail whenever the process environment happened to export ZERO_PROVIDER (e.g. an agent session), even though the tests never intended to exercise provider resolution. Pass Env: map[string]string{} to the affected Resolve calls so the tests assert only local-control resolution and are unaffected by ambient environment variables. Verified the four tests pass even with ZERO_PROVIDER=gitlawb-opengateway set. --- internal/config/local_control_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/config/local_control_test.go b/internal/config/local_control_test.go index 29d885fc5..e8305cd5a 100644 --- a/internal/config/local_control_test.go +++ b/internal/config/local_control_test.go @@ -21,7 +21,7 @@ func TestResolveLocalControlFromUserConfig(t *testing.T) { t.Fatalf("write config: %v", err) } - resolved, err := Resolve(ResolveOptions{UserConfigPath: path}) + resolved, err := Resolve(ResolveOptions{UserConfigPath: path, Env: map[string]string{}}) if err != nil { t.Fatalf("Resolve returned error: %v", err) } @@ -48,7 +48,7 @@ func TestResolveLocalControlIgnoresProjectOptIn(t *testing.T) { t.Fatalf("write project config: %v", err) } - resolved, err := Resolve(ResolveOptions{ProjectConfigPath: projectPath}) + resolved, err := Resolve(ResolveOptions{ProjectConfigPath: projectPath, Env: map[string]string{}}) if err != nil { t.Fatalf("Resolve returned error: %v", err) } @@ -61,7 +61,7 @@ func TestResolveLocalControlIgnoresProjectOptIn(t *testing.T) { } func TestLocalControlDefaultsBrowserAndTerminalOn(t *testing.T) { - resolved, err := Resolve(ResolveOptions{}) + resolved, err := Resolve(ResolveOptions{Env: map[string]string{}}) if err != nil { t.Fatalf("Resolve returned error: %v", err) } @@ -81,7 +81,7 @@ func TestLocalControlExplicitGlobalDisable(t *testing.T) { if err := os.WriteFile(path, []byte(`{"localControl":{"enabled":false}}`), 0o600); err != nil { t.Fatalf("write config: %v", err) } - resolved, err := Resolve(ResolveOptions{UserConfigPath: path}) + resolved, err := Resolve(ResolveOptions{UserConfigPath: path, Env: map[string]string{}}) if err != nil { t.Fatalf("Resolve returned error: %v", err) } From 275bfc40e4e642a537326773b9f0298ef70644f7 Mon Sep 17 00:00:00 2001 From: euxaristia <25621994+euxaristia@users.noreply.github.com> Date: Wed, 8 Jul 2026 00:13:54 -0400 Subject: [PATCH 2/2] fix(tui): align picker_test switchProviderModel call with 4-value return --- internal/tui/picker_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/tui/picker_test.go b/internal/tui/picker_test.go index 93f144b99..e9532ef54 100644 --- a/internal/tui/picker_test.go +++ b/internal/tui/picker_test.go @@ -768,7 +768,7 @@ func TestSwitchProviderModelRecordsRecentHistory(t *testing.T) { }, }) - next, status, _ := m.switchProviderModel("ollama", "kimi-k2.7-code:cloud") + next, status, _, _ := m.switchProviderModel("ollama", "kimi-k2.7-code:cloud") wantStatus := "Model\nSwitched to ollama ยท kimi-k2.7-code:cloud" if status != wantStatus { t.Fatalf("switchProviderModel() status = %q, want %q (a mismatch here means the switch itself failed, not the recentModels assertion below)", status, wantStatus)