Fix the default install dir and UI issues

Author: git-hulk

README.md

@@ -25,6 +25,7 @@ git clone https://github.com/git-hulk/clime.git && cd clime && make install
 ```
 
 The install script detects your OS (macOS / Linux) and architecture (amd64 / arm64) automatically.
+By default it installs `clime` to `~/.local/bin` and updates your shell profile if that directory is not already on `PATH`.
 
 ## How It Works
 

cmd/skills.go

@@ -155,14 +155,20 @@ func runInteractiveSkillsInstall(manifest *skill.Manifest) error {
 	}
 
 	options := append(sources, newRepoOption)
+	showSourceSpacer := true
 	for {
-		fmt.Println()
+		if showSourceSpacer {
+			fmt.Println()
+		} else {
+			showSourceSpacer = true
+		}
 		idx, err := selectPrompt(prompt.SelectConfig{
 			Label:   "Select a skill source",
 			Options: options,
 		})
 		if err != nil {
 			if errors.Is(err, prompt.ErrBack) {
+				showSourceSpacer = false
 				continue
 			}
 			return err
@@ -177,17 +183,20 @@ func runInteractiveSkillsInstall(manifest *skill.Manifest) error {
 		}
 
 		repo := options[idx]
+		showActionSpacer := true
 		for {
-			action, err := pickSourceAction(repo)
+			action, err := pickSourceAction(repo, showActionSpacer)
 			if err != nil {
 				if errors.Is(err, prompt.ErrBack) {
+					showSourceSpacer = false
 					break
 				}
 				return err
 			}
 
 			err = skillsActionRunner(manifest, repo, action)
 			if errors.Is(err, prompt.ErrBack) {
+				showActionSpacer = false
 				continue
 			}
 			return err
@@ -196,7 +205,7 @@ func runInteractiveSkillsInstall(manifest *skill.Manifest) error {
 }
 
 func uniqueSkillSources(manifest *skill.Manifest) []string {
-	// Collect unique sources from installed skills, preserving order.
+	// Collect unique sources from installed skills and tracked sources, preserving order.
 	seen := make(map[string]bool)
 	var sources []string
 	for _, s := range manifest.Skills {
@@ -205,6 +214,12 @@ func uniqueSkillSources(manifest *skill.Manifest) []string {
 			sources = append(sources, s.Source)
 		}
 	}
+	for _, s := range manifest.Sources {
+		if s != "" && !seen[s] {
+			seen[s] = true
+			sources = append(sources, s)
+		}
+	}
 
 	return sources
 }
@@ -239,14 +254,16 @@ func validateSkillRepoSource(repo string) error {
 	return nil
 }
 
-func pickSourceAction(repo string) (sourceAction, error) {
+func pickSourceAction(repo string, showSpacer bool) (sourceAction, error) {
 	options := []string{
 		"Browse and install skills",
 		"Update installed skills",
 		"Remove source and its installed skills",
 	}
 
-	fmt.Println()
+	if showSpacer {
+		fmt.Println()
+	}
 	idx, err := selectPrompt(prompt.SelectConfig{
 		Label:   fmt.Sprintf("Action for %s", repo),
 		Options: options,
@@ -265,7 +282,7 @@ func pickSourceAction(repo string) (sourceAction, error) {
 	}
 }
 
-// removeSource uninstalls all skills from the given source and removes them from the manifest.
+// removeSource uninstalls all skills from the given source and removes it from the manifest.
 func removeSource(manifest *skill.Manifest, repo string) error {
 	var names []string
 	for _, s := range manifest.Skills {
@@ -274,17 +291,21 @@ func removeSource(manifest *skill.Manifest, repo string) error {
 		}
 	}
 
-	if len(names) == 0 {
-		terminal.Warningf("No skills installed from %s.", repo)
-		return nil
-	}
-
 	fmt.Println()
 	for _, name := range names {
 		if err := uninstallByName(manifest, name); err != nil {
 			terminal.Errorf("Failed to uninstall %q: %v", name, err)
 		}
 	}
+
+	manifest.RemoveSource(repo)
+	if err := manifest.Save(); err != nil {
+		return fmt.Errorf("failed to update manifest: %w", err)
+	}
+
+	if len(names) == 0 {
+		terminal.Successf("Removed source %s.", repo)
+	}
 	return nil
 }
 
@@ -384,6 +405,12 @@ func installFromRepo(manifest *skill.Manifest, repo string) error {
 
 	spinner.Success(fmt.Sprintf("Found %d skill(s) in %q", len(repoManifest.Skills), repo))
 
+	// Record the source so it appears in future interactive menus.
+	manifest.AddSource(repo)
+	if err := manifest.Save(); err != nil {
+		return fmt.Errorf("failed to save skill source: %w", err)
+	}
+
 	// Filter out already-installed skills.
 	type candidate struct {
 		entry skill.SkillEntry
@@ -504,14 +531,20 @@ func interactiveUninstall(manifest *skill.Manifest) error {
 		options[i] = label
 	}
 
+	showSpacer := true
 	for {
-		fmt.Println()
+		if showSpacer {
+			fmt.Println()
+		} else {
+			showSpacer = true
+		}
 		selectedIdxs, err := multiSelectPrompt(prompt.SelectConfig{
 			Label:   "Select skills to uninstall (space to toggle, enter to confirm)",
 			Options: options,
 		})
 		if err != nil {
 			if errors.Is(err, prompt.ErrBack) {
+				showSpacer = false
 				continue
 			}
 			return err

cmd/skills_interactive_test.go

@@ -2,6 +2,9 @@ package cmd
 
 import (
 	"errors"
+	"io"
+	"os"
+	"strings"
 	"testing"
 
 	"github.com/git-hulk/clime/internal/prompt"
@@ -96,15 +99,20 @@ func TestRunInteractiveSkillsInstallEscAtTopLevelKeepsUIOpen(t *testing.T) {
 		return nil
 	}
 
-	if err := runInteractiveSkillsInstall(manifest); err != nil {
-		t.Fatalf("runInteractiveSkillsInstall() error = %v", err)
+	output := captureStdout(t, func() {
+		if err := runInteractiveSkillsInstall(manifest); err != nil {
+			t.Fatalf("runInteractiveSkillsInstall() error = %v", err)
+		}
+	})
+	if output != "\n" {
+		t.Fatalf("stdout = %q, want %q", output, "\n")
 	}
 	if !called {
 		t.Fatal("expected skillsActionRunner to be called")
 	}
 }
 
-func TestRunInteractiveSkillsInstallEscFromInstallReturnsToActionMenu(t *testing.T) {
+func TestRunInteractiveSkillsInstallEscFromInstallDoesNotPrintExtraSpacer(t *testing.T) {
 	manifest := &skill.Manifest{
 		Skills: []skill.InstalledSkill{
 			{Name: "alpha", Source: "owner/repo"},
@@ -121,7 +129,7 @@ func TestRunInteractiveSkillsInstallEscFromInstallReturnsToActionMenu(t *testing
 		case 1:
 			return 0, nil
 		case 2:
-			return 0, nil
+			return 1, nil
 		case 3:
 			return 1, nil
 		default:
@@ -130,23 +138,25 @@ func TestRunInteractiveSkillsInstallEscFromInstallReturnsToActionMenu(t *testing
 		}
 	}
 
-	var actions []sourceAction
+	runs := 0
 	skillsActionRunner = func(manifest *skill.Manifest, repo string, action sourceAction) error {
-		actions = append(actions, action)
-		if len(actions) == 1 {
+		runs++
+		if runs == 1 {
 			return prompt.ErrBack
 		}
 		return nil
 	}
 
-	if err := runInteractiveSkillsInstall(manifest); err != nil {
-		t.Fatalf("runInteractiveSkillsInstall() error = %v", err)
+	output := captureStdout(t, func() {
+		if err := runInteractiveSkillsInstall(manifest); err != nil {
+			t.Fatalf("runInteractiveSkillsInstall() error = %v", err)
+		}
+	})
+	if output != "\n\n" {
+		t.Fatalf("stdout = %q, want %q", output, "\n\n")
 	}
-	if len(actions) != 2 {
-		t.Fatalf("actions length = %d, want 2", len(actions))
-	}
-	if actions[0] != actionBrowseInstall || actions[1] != actionUpdate {
-		t.Fatalf("actions = %v, want [%v %v]", actions, actionBrowseInstall, actionUpdate)
+	if runs != 2 {
+		t.Fatalf("skillsActionRunner calls = %d, want 2", runs)
 	}
 }
 
@@ -169,8 +179,16 @@ func TestInteractiveUninstallEscKeepsMenuOpen(t *testing.T) {
 		return nil, nil
 	}
 
-	if err := interactiveUninstall(manifest); err != nil {
-		t.Fatalf("interactiveUninstall() error = %v", err)
+	output := captureStdout(t, func() {
+		if err := interactiveUninstall(manifest); err != nil {
+			t.Fatalf("interactiveUninstall() error = %v", err)
+		}
+	})
+	if !strings.HasPrefix(output, "\n") {
+		t.Fatalf("stdout = %q, want prefix %q", output, "\n")
+	}
+	if strings.HasPrefix(output, "\n\n") {
+		t.Fatalf("stdout = %q, want a single leading spacer line", output)
 	}
 	if calls != 2 {
 		t.Fatalf("multiSelectPrompt calls = %d, want 2", calls)
@@ -197,6 +215,83 @@ func TestInteractiveUninstallInterruptPropagates(t *testing.T) {
 	}
 }
 
+func captureStdout(t *testing.T, fn func()) string {
+	t.Helper()
+
+	origStdout := os.Stdout
+	r, w, err := os.Pipe()
+	if err != nil {
+		t.Fatalf("os.Pipe() error = %v", err)
+	}
+	os.Stdout = w
+
+	done := make(chan string, 1)
+	go func() {
+		data, _ := io.ReadAll(r)
+		done <- string(data)
+	}()
+
+	defer func() {
+		os.Stdout = origStdout
+	}()
+
+	fn()
+
+	if err := w.Close(); err != nil {
+		t.Fatalf("stdout close error = %v", err)
+	}
+	output := <-done
+	if err := r.Close(); err != nil {
+		t.Fatalf("stdout reader close error = %v", err)
+	}
+	return output
+}
+func TestRunInteractiveSkillsInstallEscFromInstallReturnsToActionMenu(t *testing.T) {
+	manifest := &skill.Manifest{
+		Skills: []skill.InstalledSkill{
+			{Name: "alpha", Source: "owner/repo"},
+		},
+	}
+
+	restore := stubSkillPrompts(t)
+	defer restore()
+
+	selectCalls := 0
+	selectPrompt = func(config prompt.SelectConfig) (int, error) {
+		selectCalls++
+		switch selectCalls {
+		case 1:
+			return 0, nil
+		case 2:
+			return 0, nil
+		case 3:
+			return 1, nil
+		default:
+			t.Fatalf("unexpected select call %d", selectCalls)
+			return 0, nil
+		}
+	}
+
+	var actions []sourceAction
+	skillsActionRunner = func(manifest *skill.Manifest, repo string, action sourceAction) error {
+		actions = append(actions, action)
+		if len(actions) == 1 {
+			return prompt.ErrBack
+		}
+		return nil
+	}
+
+	if err := runInteractiveSkillsInstall(manifest); err != nil {
+		t.Fatalf("runInteractiveSkillsInstall() error = %v", err)
+	}
+	if len(actions) != 2 {
+		t.Fatalf("actions length = %d, want 2", len(actions))
+	}
+	if actions[0] != actionBrowseInstall || actions[1] != actionUpdate {
+		t.Fatalf("actions = %v, want [%v %v]", actions, actionBrowseInstall, actionUpdate)
+	}
+}
+
 func stubSkillPrompts(t *testing.T) func() {
 	t.Helper()
 

install.sh

@@ -43,7 +43,7 @@ if [ -z "$INSTALL_DIR" ]; then
     if [ -n "$PLUGIN" ]; then
         INSTALL_DIR="${HOME}/.clime/plugins"
     else
-        INSTALL_DIR="${HOME}/.clime/bin"
+        INSTALL_DIR="${HOME}/.local/bin"
     fi
 fi