feat(core): snapshot CLI configs before switch and restore on reset.

Persist pre-clovapi config bytes in profiles.json so reset can fully restore originals, with legacy field deletion as fallback when no snapshot exists.

Author: joohw

core/cmd/switch_cmd.go

@@ -12,6 +12,7 @@ import (
 	"github.com/clovapi/switcher/internal/apistyle"
 	"github.com/clovapi/switcher/internal/apply"
 	"github.com/clovapi/switcher/internal/cliswitch"
+	"github.com/clovapi/switcher/internal/desktop"
 	"github.com/clovapi/switcher/internal/profile"
 	"github.com/clovapi/switcher/internal/syslog"
 )
@@ -27,14 +28,11 @@ func runSwitch(sc *bufio.Scanner, s *profile.Store, kind agentkind.Kind, resetFl
 		if strings.TrimSpace(providerFlag) != "" || strings.TrimSpace(vendorFlag) != "" || strings.TrimSpace(modelFlag) != "" {
 			return fmt.Errorf("cannot use --reset with --provider, --vendor or --model")
 		}
-		if err := apply.ResetDefault(kind); err != nil {
+		if err := desktop.ResetCLIToDefault(kind); err != nil {
 			return err
 		}
 		syslog.LogCLIReset(kind)
-		if err := clearActiveBinding(kind); err != nil {
-			return err
-		}
-		fmt.Printf("Reset %s to default (cleared clovapi relay bindings).\n", kind)
+		fmt.Printf("Reset %s to default (restored backup when available; otherwise cleared clovapi relay bindings).\n", kind)
 		return nil
 	}
 
@@ -57,13 +55,10 @@ func runSwitch(sc *bufio.Scanner, s *profile.Store, kind agentkind.Kind, resetFl
 		return err
 	} else if ok {
 		if picked.reset {
-			if err := apply.ResetDefault(kind); err != nil {
-				return err
-			}
-			if err := clearActiveBinding(kind); err != nil {
+			if err := desktop.ResetCLIToDefault(kind); err != nil {
 				return err
 			}
-			fmt.Printf("Reset %s to default (cleared clovapi relay bindings).\n", kind)
+			fmt.Printf("Reset %s to default (restored backup when available; otherwise cleared clovapi relay bindings).\n", kind)
 			return nil
 		}
 		return applyProviderModelSwitch(kind, picked.selection.ProviderID, picked.selection.ModelID)
@@ -76,40 +71,23 @@ func runSwitch(sc *bufio.Scanner, s *profile.Store, kind agentkind.Kind, resetFl
 	}
 
 	if !switchNeedsInteractive(sc, s, kind, bindingFlag, providerFlag, vendorFlag, modelFlag, directBaseURL, positional) {
-		return fmt.Errorf("no model selected for %s — pass Vendor/model, or --vendor with --model, or --binding", kind)
+		return fmt.Errorf("no model selected for %s - pass Vendor/model, or --vendor with --model, or --binding", kind)
 	}
 
 	picked, err := promptSwitchForCLI(sc, kind, s)
 	if err != nil {
 		return err
 	}
 	if picked.reset {
-		if err := apply.ResetDefault(kind); err != nil {
-			return err
-		}
-		if err := clearActiveBinding(kind); err != nil {
+		if err := desktop.ResetCLIToDefault(kind); err != nil {
 			return err
 		}
-		fmt.Printf("Reset %s to default (cleared clovapi relay bindings).\n", kind)
+		fmt.Printf("Reset %s to default (restored backup when available; otherwise cleared clovapi relay bindings).\n", kind)
 		return nil
 	}
 	return applyProviderModelSwitch(kind, picked.selection.ProviderID, picked.selection.ModelID)
 }
 
-func clearActiveBinding(kind agentkind.Kind) error {
-	_, err := profile.WithLockedStore(func(s *profile.Store) (bool, error) {
-		if s.Active == nil {
-			return false, nil
-		}
-		if _, ok := s.Active[string(kind)]; !ok {
-			return false, nil
-		}
-		s.ClearActive(string(kind))
-		return true, nil
-	})
-	return err
-}
-
 type switchPick struct {
 	selection profile.ActiveSelection
 	reset     bool
@@ -118,7 +96,7 @@ type switchPick struct {
 func promptSwitchForCLI(sc *bufio.Scanner, kind agentkind.Kind, s *profile.Store) (switchPick, error) {
 	vendors := cliswitch.VendorsForCLI(s, kind)
 	if len(vendors) == 0 {
-		return switchPick{}, fmt.Errorf("no compatible vendors for %s — configure providers in the desktop app or profiles.json", kind)
+		return switchPick{}, fmt.Errorf("no compatible vendors for %s - configure providers in the desktop app or profiles.json", kind)
 	}
 
 	fmt.Println()
@@ -154,7 +132,7 @@ func promptSwitchForCLI(sc *bufio.Scanner, kind agentkind.Kind, s *profile.Store
 			return switchPick{reset: true}, nil
 		}
 		if n < 1 || n > len(vendorPicks) {
-			return switchPick{}, fmt.Errorf("choose 0–%d", len(vendorPicks))
+			return switchPick{}, fmt.Errorf("choose 0-%d", len(vendorPicks))
 		}
 		return promptModelForVendor(sc, kind, s, vendorPicks[n-1], activeProvider, activeModel, hasActive)
 	}
@@ -218,7 +196,7 @@ func promptModelForVendor(sc *bufio.Scanner, kind agentkind.Kind, s *profile.Sto
 	}
 	if n, err := strconv.Atoi(line); err == nil {
 		if n < 1 || n > len(modelPicks) {
-			return switchPick{}, fmt.Errorf("choose 1–%d", len(modelPicks))
+			return switchPick{}, fmt.Errorf("choose 1-%d", len(modelPicks))
 		}
 		modelID := strings.TrimSpace(modelPicks[n-1].ID)
 		selection, err := cliswitch.ResolveSelection(s, kind, vendorName, modelID)
@@ -253,7 +231,7 @@ func modelStyleShow(m profile.Model) string {
 	if strings.TrimSpace(string(m.APIStyle)) != "" {
 		return string(m.APIStyle)
 	}
-	return "—"
+	return "-"
 }
 
 func resolveSwitchSelectionOrError(s *profile.Store, kind agentkind.Kind, providerFlag, vendorFlag, modelFlag, bindingFlag, positional string) (profile.ActiveSelection, error) {
@@ -349,6 +327,9 @@ func applyDirectToCLI(kind agentkind.Kind, baseURL, apiKey, model, styleStr stri
 	if !apply.KindSupportsStyle(kind, p.APIStyle) {
 		return fmt.Errorf("cli %q does not support api_style %q (supported here: %s)", kind, p.APIStyle, styleChoices(kind))
 	}
+	if err := desktop.EnsureCLIBackup(kind); err != nil {
+		return err
+	}
 	if err := apply.Apply(p); err != nil {
 		return err
 	}

core/internal/buildinfo/buildinfo.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Set at link time via -ldflags (see .goreleaser.yaml).
 var (
-	Version = "dev0.1.71"
+	Version = "dev0.1.73"
 	Commit  = "none"
 	Date    = "unknown"
 )

core/internal/desktop/backup.go

@@ -0,0 +1,139 @@
+package desktop
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/clovapi/switcher/internal/agentkind"
+	"github.com/clovapi/switcher/internal/apply"
+	"github.com/clovapi/switcher/internal/profile"
+)
+
+func cliConfigPath(kind agentkind.Kind) (string, error) {
+	switch kind {
+	case agentkind.ClaudeCode:
+		return apply.ClaudeSettingsPath()
+	case agentkind.Codex:
+		return apply.CodexConfigPath()
+	case agentkind.OpenCode:
+		return apply.OpenCodeConfigPath()
+	case agentkind.OpenClaw:
+		return apply.OpenClawConfigPath()
+	case agentkind.Hermes:
+		return apply.HermesConfigPath()
+	case agentkind.KimiCode:
+		return apply.KimiConfigPath()
+	default:
+		return "", fmt.Errorf("unsupported cli %q", kind)
+	}
+}
+
+func writeBackupFileAtomic(path string, data []byte, perm os.FileMode) error {
+	dir := filepath.Dir(path)
+	if err := os.MkdirAll(dir, 0o700); err != nil {
+		return err
+	}
+	tmp := path + ".tmp"
+	if err := os.WriteFile(tmp, data, perm); err != nil {
+		return err
+	}
+	if err := os.Rename(tmp, path); err != nil {
+		_ = os.Remove(tmp)
+		return err
+	}
+	return nil
+}
+
+// EnsureCLIBackup captures the original config file before clovapi mutates it.
+// Once a backup exists for the CLI, later switches keep reusing it until reset.
+func EnsureCLIBackup(kind agentkind.Kind) error {
+	_, err := profile.WithLockedStore(func(s *profile.Store) (bool, error) {
+		if _, ok := s.BackupForCLI(string(kind)); ok {
+			return false, nil
+		}
+		path, err := cliConfigPath(kind)
+		if err != nil {
+			return false, err
+		}
+		backup := profile.ConfigBackup{Path: path}
+		data, err := os.ReadFile(path)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				return false, err
+			}
+		} else {
+			backup.Existed = true
+			backup.Content = append([]byte(nil), data...)
+		}
+		s.SetBackup(string(kind), backup)
+		if s.Version < profile.StoreVersion {
+			s.Version = profile.StoreVersion
+		}
+		return true, nil
+	})
+	return err
+}
+
+func restoreBackupFile(kind agentkind.Kind, backup profile.ConfigBackup) error {
+	path, err := cliConfigPath(kind)
+	if err != nil {
+		return err
+	}
+	if backup.Existed {
+		return writeBackupFileAtomic(path, backup.Content, 0o600)
+	}
+	if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+	stale := strings.TrimSpace(backup.Path)
+	if stale != "" && stale != path {
+		if err := os.Remove(stale); err != nil && !os.IsNotExist(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+// ResetCLIToDefault restores the exact pre-clovapi config snapshot when one is
+// available. Older stores without a snapshot fall back to the legacy
+// best-effort field deletion logic.
+func ResetCLIToDefault(kind agentkind.Kind) error {
+	restored := false
+	_, err := profile.WithLockedStore(func(s *profile.Store) (bool, error) {
+		backup, ok := s.BackupForCLI(string(kind))
+		if !ok {
+			return false, nil
+		}
+		if err := restoreBackupFile(kind, backup); err != nil {
+			return false, err
+		}
+		s.ClearBackup(string(kind))
+		s.ClearActive(string(kind))
+		restored = true
+		return true, nil
+	})
+	if err != nil {
+		return err
+	}
+	if restored {
+		return nil
+	}
+	if err := apply.ResetDefault(kind); err != nil {
+		return err
+	}
+	_, err = profile.WithLockedStore(func(s *profile.Store) (bool, error) {
+		changed := false
+		if _, ok := s.BackupForCLI(string(kind)); ok {
+			s.ClearBackup(string(kind))
+			changed = true
+		}
+		if _, ok := s.Active[string(kind)]; ok {
+			s.ClearActive(string(kind))
+			changed = true
+		}
+		return changed, nil
+	})
+	return err
+}