Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -2283,7 +2283,7 @@ func (a *App) SetModelForTab(tabID, name string) error {
name = entry.Name + "/" + entry.Model
effortOverride := cloneStringPtr(tab.effort)
if effortOverride != nil {
normalized, err := config.NormalizeEffort(entry, config.EffortDisplay(&config.ProviderEntry{Effort: *effortOverride, Name: entry.Name, Kind: entry.Kind, BaseURL: entry.BaseURL}))
normalized, err := config.NormalizeEffort(entry, config.EffortDisplay(&config.ProviderEntry{Effort: *effortOverride}))
if err != nil {
effortOverride = nil
} else {
Expand Down
39 changes: 39 additions & 0 deletions desktop/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,45 @@ close_behavior = "quit"
}
}

func TestSaveProviderPersistsReasoningProtocol(t *testing.T) {
isolateDesktopUserDirs(t)

app := NewApp()
if err := app.SaveProvider(ProviderView{
Name: "deepseek-proxy",
Kind: "openai",
BaseURL: "https://proxy.example.com/v1",
Models: []string{"deepseek-v4-flash"},
Default: "deepseek-v4-flash",
APIKeyEnv: "DEEPSEEK_PROXY_KEY",
ReasoningProtocol: "none",
SupportedEfforts: []string{"high", "max"},
DefaultEffort: "max",
}); err != nil {
t.Fatalf("SaveProvider: %v", err)
}

cfg := config.LoadForEdit(config.UserConfigPath())
got, ok := cfg.Provider("deepseek-proxy")
if !ok {
t.Fatal("saved provider not found")
}
if got.ReasoningProtocol != "none" || got.DefaultEffort != "max" {
t.Fatalf("saved provider = %+v, want reasoning_protocol none and default_effort max", got)
}

view := app.Settings()
for _, p := range view.Providers {
if p.Name == "deepseek-proxy" {
if p.ReasoningProtocol != "none" {
t.Fatalf("settings reasoningProtocol = %q, want none", p.ReasoningProtocol)
}
return
}
}
t.Fatalf("Settings() missing saved provider: %+v", view.Providers)
}

func TestMigrateDesktopPreferencesDoesNotOverwriteExistingConfig(t *testing.T) {
isolateDesktopUserDirs(t)

Expand Down
61 changes: 61 additions & 0 deletions desktop/dotenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ func upsertDotEnv(key, value string) error {
return upsertEnvFile(credentialsPath(), key, value)
}

func removeDotEnv(key string) error {
return removeEnvFile(credentialsPath(), key)
}

// upsertEnvFile merges KEY=value into a KEY=value file at path, preserving
// comments and unrelated lines, writing atomically via a sibling temp + rename.
func upsertEnvFile(path, key, value string) error {
Expand Down Expand Up @@ -86,6 +90,63 @@ func upsertEnvFile(path, key, value string) error {
return os.Setenv(key, value)
}

func removeEnvFile(path, key string) error {
key = strings.TrimSpace(key)
if key == "" {
return nil
}
data, err := os.ReadFile(path)
if err != nil {
if os.IsNotExist(err) {
return os.Unsetenv(key)
}
return err
}
lines := strings.Split(strings.TrimRight(string(data), "\n"), "\n")
outLines := make([]string, 0, len(lines))
for _, ln := range lines {
t := strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(ln), "export "))
if t == "" || strings.HasPrefix(t, "#") {
outLines = append(outLines, ln)
continue
}
if k, _, ok := strings.Cut(t, "="); ok && strings.TrimSpace(k) == key {
continue
}
outLines = append(outLines, ln)
}
out := ""
if len(outLines) > 0 {
out = strings.Join(outLines, "\n") + "\n"
}

dir := filepath.Dir(path)
if dir != "" && dir != "." {
if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
}
tmp, err := os.CreateTemp(dir, "credentials.*.tmp")
if err != nil {
return err
}
tmpPath := tmp.Name()
if _, err := tmp.WriteString(out); err != nil {
tmp.Close()
os.Remove(tmpPath)
return err
}
if err := tmp.Close(); err != nil {
os.Remove(tmpPath)
return err
}
if err := fileutil.ReplaceFile(tmpPath, path); err != nil {
os.Remove(tmpPath)
return err
}
return os.Unsetenv(key)
}

// envFileKeys returns the set of KEY names assigned in a KEY=value file, empty
// when the file is absent.
func envFileKeys(path string) map[string]bool {
Expand Down
26 changes: 26 additions & 0 deletions desktop/dotenv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@ func TestUpsertEnvFile(t *testing.T) {
}
}

func TestRemoveEnvFileDeletesKeyAndUnsetsProcessEnv(t *testing.T) {
path := filepath.Join(t.TempDir(), "credentials")
if err := os.WriteFile(path, []byte("# comment\nFOO=old\nexport BAR=remove\nBAZ=keep\n"), 0o644); err != nil {
t.Fatal(err)
}
t.Setenv("BAR", "remove")

if err := removeEnvFile(path, "BAR"); err != nil {
t.Fatalf("remove: %v", err)
}

b, _ := os.ReadFile(path)
got := string(b)
for _, want := range []string{"# comment", "FOO=old", "BAZ=keep"} {
if !strings.Contains(got, want) {
t.Errorf("missing %q in:\n%s", want, got)
}
}
if strings.Contains(got, "BAR=") {
t.Errorf("removed key should be absent:\n%s", got)
}
if _, ok := os.LookupEnv("BAR"); ok {
t.Errorf("process env BAR should be unset")
}
}

// TestPromoteProviderKeysLiftsProjectKeyAndStripsHomeEnv proves a provider key
// that resolves only from a project .env / ~/.env is copied into the global
// credentials store, removed from ~/.env, and that unrelated env vars are ignored.
Expand Down
79 changes: 79 additions & 0 deletions desktop/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading