cleanig

Author: algospider

git-genius

@@ -73,10 +73,6 @@ func HasStoredToken() bool {
 	return storedToken() != ""
 }
 
-func HasStoredUsername() bool {
-	return storedUsername() != ""
-}
-
 func storedToken() string {
 	path, err := getTokenPath()
 	if err != nil {

internal/github/token.go

@@ -160,7 +160,7 @@ func mainMenu() bool {
 
 func limitedMenu() bool {
 	fmt.Println("1) Setup / Reconfigure")
-	fmt.Println("2) Change Project Directory")
+	fmt.Println("2) Switch Project")
 	fmt.Println("3) Doctor (health check)")
 	fmt.Println("4) Help / About")
 	fmt.Println("5) Exit")
@@ -171,7 +171,7 @@ func limitedMenu() bool {
 	case "1":
 		track("tools", "setup_reconfigure", setup.Run)
 	case "2":
-		track("tools", "change_project_dir", setup.ChangeProjectDir)
+		track("tools", "switch_project", setup.SwitchProject)
 	case "3":
 		track("tools", "doctor", doctor.Run)
 	case "4", "h", "help", "?":
@@ -308,14 +308,14 @@ func toolsMenu(gitAvailable bool) {
 		ui.Header("Tools")
 
 		fmt.Println("1) Setup / Reconfigure")
+		fmt.Println("2) Switch Project")
+
 		if gitAvailable {
-			fmt.Println("2) Create / Link GitHub Repository")
-			fmt.Println("3) Git Auth / Credential Helper")
-			fmt.Println("4) Switch Project / Repo")
+			fmt.Println("3) Create / Link GitHub Repository")
+			fmt.Println("4) Git Auth / Credential Helper")
 			fmt.Println("5) Doctor (health check)")
 			fmt.Println("6) Back")
 		} else {
-			fmt.Println("2) Change Project Directory")
 			fmt.Println("3) Doctor (health check)")
 			fmt.Println("4) Back")
 		}
@@ -326,28 +326,24 @@ func toolsMenu(gitAvailable bool) {
 		case "1":
 			track("tools", "setup_reconfigure", setup.Run)
 		case "2":
-			if gitAvailable {
-				track("tools", "create_or_link_repo", setup.CreateOrLinkRepo)
-			} else {
-				track("tools", "change_project_dir", setup.ChangeProjectDir)
-			}
+			track("tools", "switch_project", setup.SwitchProject)
 		case "3":
 			if gitAvailable {
-				track("tools", "configure_git_auth", setup.ConfigureGitAuth)
+				track("tools", "create_or_link_repo", setup.CreateOrLinkRepo)
 			} else {
 				track("tools", "doctor", doctor.Run)
 			}
 		case "4":
 			if gitAvailable {
-				track("tools", "switch_project_repo", setup.SwitchProjectRepo)
+				track("tools", "configure_git_auth", setup.ConfigureGitAuth)
 			} else {
 				return
 			}
 		case "5":
 			if gitAvailable {
 				track("tools", "doctor", doctor.Run)
 			} else {
-				return
+				ui.Error("Invalid option")
 			}
 		case "6":
 			if gitAvailable {

internal/menu/menu.go

@@ -12,22 +12,13 @@ import (
 	"git-genius/internal/ui"
 )
 
-func ChangeProjectDir() bool {
-	return switchProject(false)
-}
-
-func SwitchProjectRepo() bool {
-	return switchProject(true)
-}
-
-func switchProject(withRepoOptions bool) bool {
-	title := "Change Project Directory"
-	if withRepoOptions {
-		title = "Switch Project / Repo"
-	}
-
+/*
+SwitchProject is the unified entry point for changing the active project directory.
+It detects if the target is a Git repo and shows context before switching.
+*/
+func SwitchProject() bool {
 	ui.Clear()
-	ui.Header(title)
+	ui.Header("Switch Project")
 
 	current := config.Load().GetWorkDir()
 	ui.Info("Current project directory:")
@@ -52,33 +43,65 @@ func switchProject(withRepoOptions bool) bool {
 			return false
 		}
 
-		cfg, isRepo, err := activateProjectDir(resolveRecentDir(dir, recent))
+		targetDir := resolveRecentDir(dir, recent)
+		abs, err := filepath.Abs(targetDir)
 		if err != nil {
-			ui.Error(err.Error())
+			ui.Error("Failed to resolve directory path")
+			if !ui.ConfirmDefault("Try another directory?", true) {
+				return false
+			}
+			continue
+		}
+
+		info, err := os.Stat(abs)
+		if err != nil || !info.IsDir() {
+			ui.Error("Invalid directory path")
 			if !ui.ConfirmDefault("Try another directory?", true) {
 				return false
 			}
 			continue
 		}
 
+		// Load config for the target directory to show context
+		targetCfg := config.LoadForWorkDir(abs)
+		isRepo := system.IsGitRepoAt(abs)
+
+		ui.Divider()
+		ui.Info("Target Directory: " + abs)
+		if isRepo {
+			ui.Success("Git repository detected")
+			showRepoContext(abs, targetCfg)
+		} else {
+			ui.Warn("Not a git repository")
+		}
+		ui.Divider()
+
+		if !ui.ConfirmDefault("Switch to this project?", true) {
+			if ui.Confirm("Try another directory?") {
+				continue
+			}
+			return false
+		}
+
+		// Perform the switch
+		config.SetActiveWorkDir(abs)
 		ui.Success("Project directory updated")
-		ui.Info("New project directory:")
-		ui.Info(cfg.WorkDir)
 
 		if !isRepo {
-			return handleNonRepoSelection(cfg)
+			return handleNonRepoSelection(targetCfg)
 		}
 
-		ui.Success("Git repository detected in new directory")
-		bootstrapProjectConfig(&cfg)
+		// Sync branch/remote defaults if it's a new repo for Git Genius
+		bootstrapProjectConfig(&targetCfg)
 
-		if !system.EnsureBranchSync() {
-			return false
+		// Offer post-switch options if Git is available
+		if system.CommandExists("git") {
+			if !system.EnsureBranchSync() {
+				return false
+			}
+			return offerRepoSwitchOptions(targetCfg)
 		}
 
-		if withRepoOptions {
-			return offerRepoSwitchOptions(cfg)
-		}
 		return true
 	}
 }
@@ -93,29 +116,32 @@ func resolveRecentDir(input string, recent []string) string {
 	return input
 }
 
-func activateProjectDir(dir string) (config.Config, bool, error) {
-	abs, err := filepath.Abs(strings.TrimSpace(dir))
-	if err != nil {
-		return config.Config{}, false, fmt.Errorf("failed to resolve directory path")
+func showRepoContext(dir string, cfg config.Config) {
+	// We need to temporarily set the work dir to inspect it, or use GitOutputAt
+	branch, _ := system.GitOutputAt(dir, "branch", "--show-current")
+	if branch == "" {
+		branch = cfg.Branch
 	}
-
-	info, err := os.Stat(abs)
-	if err != nil || !info.IsDir() {
-		return config.Config{}, false, fmt.Errorf("invalid directory path")
+	if branch == "" {
+		branch = "-"
 	}
 
-	config.SetActiveWorkDir(abs)
-
-	if system.IsGitRepo() {
-		system.EnsureSafeDirectory(abs)
-		cfg := config.Load()
-		cfg.WorkDir = abs
-		return cfg, true, nil
+	remote := cfg.Remote
+	if remote == "" {
+		// Try to auto-detect a remote if not in config
+		if remotes, err := system.RemoteNames(); err == nil && len(remotes) > 0 {
+			remote = remotes[0]
+		}
+	}
+	if remote == "" {
+		remote = "-"
 	}
 
-	cfg := config.LoadForWorkDir(abs)
-	cfg.WorkDir = abs
-	return cfg, false, nil
+	ui.Info("Branch : " + branch)
+	ui.Info("Remote : " + remote)
+	if cfg.Owner != "" && cfg.Repo != "" {
+		ui.Info("Repo   : https://github.com/" + cfg.Owner + "/" + cfg.Repo)
+	}
 }
 
 func bootstrapProjectConfig(cfg *config.Config) {
@@ -126,14 +152,17 @@ func bootstrapProjectConfig(cfg *config.Config) {
 	changed := false
 
 	if !config.HasProjectConfig(cfg.WorkDir) {
-		if branch := system.CurrentGitBranch(); branch != "" {
+		if branch, _ := system.GitOutputAt(cfg.WorkDir, "branch", "--show-current"); branch != "" {
 			cfg.Branch = branch
 			changed = true
 		}
 
-		if remotes, err := system.RemoteNames(); err == nil && len(remotes) == 1 {
-			cfg.Remote = remotes[0]
-			changed = true
+		if remotes, err := system.GitOutputAt(cfg.WorkDir, "remote"); err == nil && remotes != "" {
+			lines := strings.Split(remotes, "\n")
+			if len(lines) > 0 && lines[0] != "" {
+				cfg.Remote = strings.TrimSpace(lines[0])
+				changed = true
+			}
 		}
 	}
 
@@ -142,17 +171,21 @@ func bootstrapProjectConfig(cfg *config.Config) {
 	}
 
 	config.Save(*cfg)
-	ui.Info("Loaded repo defaults for this project so setup does not need to be repeated")
+	ui.Info("Loaded repo defaults for this project")
 }
 
 func handleNonRepoSelection(cfg config.Config) bool {
-	ui.Warn("Selected directory is not a git repository")
+	if !system.CommandExists("git") {
+		ui.Warn("Git is not installed. Operations will be limited.")
+		return true
+	}
+
 	if !ui.Confirm("Initialize a git repository here?") {
 		ui.Warn("Git operations will be limited until repo is initialized")
 		return true
 	}
 
-	if err := system.RunGit("init"); err != nil {
+	if err := system.RunGitAt(cfg.WorkDir, "init"); err != nil {
 		ui.Error("Failed to initialize git repository")
 		return false
 	}
@@ -161,37 +194,39 @@ func handleNonRepoSelection(cfg config.Config) bool {
 	bootstrapProjectConfig(&cfg)
 
 	if cfg.Branch != "" {
-		if err := system.PrepareBranch(cfg.Branch); err != nil {
-			ui.Warn("Could not prepare configured branch")
-			ui.Info(err.Error())
-		} else {
-			ui.Success("Branch ready: " + cfg.Branch)
-		}
+		// We can't use PrepareBranch easily here because it uses config.Load()
+		// but we just initialized a repo. Let's just try to create/checkout.
+		_ = system.RunGitAt(cfg.WorkDir, "checkout", "-b", cfg.Branch)
 	}
 
 	return true
 }
 
 func offerRepoSwitchOptions(cfg config.Config) bool {
-	ui.Info("Saved branch : " + cfg.Branch)
-	ui.Info("Saved remote : " + cfg.Remote)
+	ui.Info("Current branch : " + cfg.Branch)
+	ui.Info("Current remote : " + cfg.Remote)
 
-	if ui.Confirm("Switch branch in this repo now?") {
+	if ui.Confirm("Switch branch now?") {
 		if !gitops.SwitchBranch() {
 			return false
 		}
 	}
 
-	if ui.Confirm("Configure or switch the active remote now?") {
+	if ui.Confirm("Configure or switch remote now?") {
 		if !gitops.SwitchRemote() {
 			return false
 		}
 	}
 
-	if !config.HasProjectConfig(cfg.WorkDir) {
-		ui.Info("This repo is using auto-detected defaults right now")
-		ui.Info("Run Tools -> Setup / Reconfigure later if you want to save owner/repo details too")
-	}
-
 	return true
 }
+
+// Deprecated: used for backward compatibility during refactor
+func ChangeProjectDir() bool {
+	return SwitchProject()
+}
+
+// Deprecated: used for backward compatibility during refactor
+func SwitchProjectRepo() bool {
+	return SwitchProject()
+}

internal/setup/change_dir.go

@@ -668,14 +668,6 @@ func envSlice(env map[string]string) []string {
 	return out
 }
 
-func CurrentGitBranchAt(dir string) string {
-	branch, err := GitOutputAt(dir, "branch", "--show-current")
-	if err != nil {
-		return ""
-	}
-	return branch
-}
-
 func EnsureBranchSync() bool {
 	if !IsGitRepo() {
 		return true

internal/system/git.go

@@ -109,6 +109,12 @@ var HelpTools = []string{
 	"- Initialize git",
 	"- Configure branch, remote, GitHub",
 	"",
+	"Switch Project",
+	"- Switch to another project folder",
+	"- Detects if the folder is a Git repo and shows context before switching",
+	"- Loads that repo's saved branch and remote config when available",
+	"- Can immediately switch branch or remote after changing directory",
+	"",
 	"Create / Link GitHub Repository",
 	"- Create repo on GitHub if missing",
 	"- Link local project to GitHub",
@@ -119,11 +125,6 @@ var HelpTools = []string{
 	"- Can preload your current GitHub token into Git",
 	"- Best fix when push keeps asking for username and token",
 	"",
-	"Switch Project / Repo",
-	"- Switch to another project folder without re-running full setup",
-	"- Loads that repo's saved branch and remote config when available",
-	"- Can immediately switch branch or remote after changing directory",
-	"",
 	"Doctor",
 	"- Checks git, branch, remote, token, repo",
 	"- Suggests fixes if something is wrong",
@@ -168,7 +169,7 @@ var HelpWorkflow = []string{
 	"- Push with a clear commit message",
 	"",
 	"Multi-Project Workflow",
-	"- Use Tools -> Switch Project / Repo",
+	"- Use Tools -> Switch Project",
 	"- Re-run Setup when switching to a brand-new repo",
 }
 
@@ -190,6 +191,6 @@ var HelpTroubleshooting = []string{
 	"- Re-run Tools -> Setup / Reconfigure if needed",
 	"",
 	"Switching between repos should not require setup every time",
-	"- Use Tools -> Switch Project / Repo",
+	"- Use Tools -> Switch Project",
 	"- Each repo keeps its own local .git/.genius/config.json",
 }