feat: update and version command for skill user and some minor fixes

Author: nitintf

.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "Beautiful themed status line for Claude Code with real-time usage tracking, progress bars, and 10 built-in themes",
-    "version": "0.3.0"
+    "version": "0.4.0"
   },
   "plugins": [
     {

.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "claudewatch",
   "description": "Beautiful themed status line for Claude Code with real-time usage tracking, progress bars, and 10 built-in themes",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "author": {
     "name": "Nitin Panwar",
     "url": "https://github.com/nitintf"

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.4.0
+
+- `update` command — fetch latest version and re-register (`claudewatch update`)
+- `version` command — print installed version (`claudewatch version`)
+- `/claudewatch:update` skill for updating via Claude Code
+- Install now creates config file with all keys explicitly set
+- `show_cost` defaults to `false` (was `true`)
+- Uninstall preserves config file for future reinstalls
+- `/claudewatch:config` skill now covers all settings — theme + all segment toggles
+
 ## v0.3.0
 
 - Session cost display (`cost $1.23`) from Claude Code status JSON

README.md

@@ -94,5 +94,15 @@ Custom themes go in `~/.config/claudewatch/themes/*.toml`.
 | Command | Description |
 |---------|-------------|
 | `/claudewatch:setup` | Install binary and configure theme |
-| `/claudewatch:config` | Change theme interactively |
-| `/claudewatch:uninstall` | Remove claudewatch completely |
+| `/claudewatch:config` | Change theme and toggle segments |
+| `/claudewatch:update` | Update to latest version |
+| `/claudewatch:uninstall` | Remove claudewatch (keeps config) |
+
+## CLI commands
+
+| Command | Description |
+|---------|-------------|
+| `claudewatch install` | Register with Claude Code + create config |
+| `claudewatch uninstall` | Remove from Claude Code (keeps config) |
+| `claudewatch update` | Fetch latest version and re-register |
+| `claudewatch version` | Print installed version |

internal/config/config.go

@@ -10,13 +10,13 @@ import (
 // Config holds the user's claudewatch configuration.
 type Config struct {
 	Theme      string `toml:"theme"`
-	ShowPlan   *bool  `toml:"show_plan,omitempty"`
-	Show5h     *bool  `toml:"show_5h,omitempty"`
-	Show7d     *bool  `toml:"show_7d,omitempty"`
-	ShowExtra  *bool  `toml:"show_extra,omitempty"`
-	ShowCost   *bool  `toml:"show_cost,omitempty"`
-	ShowCwd    *bool  `toml:"show_cwd,omitempty"`
-	ShowBranch *bool  `toml:"show_branch,omitempty"`
+	ShowPlan   *bool  `toml:"show_plan"`
+	Show5h     *bool  `toml:"show_5h"`
+	Show7d     *bool  `toml:"show_7d"`
+	ShowExtra  *bool  `toml:"show_extra"`
+	ShowCost   *bool  `toml:"show_cost"`
+	ShowCwd    *bool  `toml:"show_cwd"`
+	ShowBranch *bool  `toml:"show_branch"`
 }
 
 func boolPtr(b bool) *bool { return &b }
@@ -29,7 +29,7 @@ func DefaultConfig() Config {
 		Show5h:     boolPtr(true),
 		Show7d:     boolPtr(true),
 		ShowExtra:  boolPtr(true),
-		ShowCost:   boolPtr(true),
+		ShowCost:   boolPtr(false),
 		ShowCwd:    boolPtr(false),
 		ShowBranch: boolPtr(false),
 	}

internal/statusline/statusline_test.go

@@ -110,7 +110,10 @@ func TestRenderCost(t *testing.T) {
 		ContextWindow: contextWindow{UsedPercentage: ptrFloat(30)},
 		Cost:          costInfo{TotalCostUSD: 1.23},
 	}
-	out := Render(&s, testTheme(), "", nil, defaultCfg())
+	tr := true
+	cfg := defaultCfg()
+	cfg.ShowCost = &tr
+	out := Render(&s, testTheme(), "", nil, cfg)
 	if !strings.Contains(out, "$1.23") {
 		t.Error("expected $1.23 in output")
 	}

main.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime/debug"
 	"strings"
 
 	"github.com/nitintf/claudewatch/internal/api"
@@ -24,12 +25,17 @@ func main() {
 			err = install()
 		case "uninstall":
 			err = uninstall()
+		case "update":
+			err = update()
+		case "version":
+			printVersion()
+			return
 		}
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(1)
 		}
-		if os.Args[1] == "install" || os.Args[1] == "uninstall" {
+		if os.Args[1] == "install" || os.Args[1] == "uninstall" || os.Args[1] == "update" || os.Args[1] == "version" {
 			return
 		}
 	}
@@ -129,6 +135,16 @@ func install() error {
 		return err
 	}
 
+	// Create default config file if it doesn't exist.
+	cfgPath, err := config.Path()
+	if err == nil {
+		if _, statErr := os.Stat(cfgPath); os.IsNotExist(statErr) {
+			if saveErr := config.Save(config.DefaultConfig()); saveErr == nil {
+				fmt.Printf("  config:   %s\n", cfgPath)
+			}
+		}
+	}
+
 	fmt.Printf("Installed claudewatch as Claude Code status line\n")
 	fmt.Printf("  binary:   %s\n", binaryPath)
 	fmt.Printf("  settings: %s\n", settingsPath)
@@ -156,10 +172,6 @@ func uninstall() error {
 		}
 	}
 
-	// Remove config directory.
-	cfgDir := filepath.Join(home, ".config", "claudewatch")
-	_ = os.RemoveAll(cfgDir)
-
 	// Remove usage cache.
 	_ = os.Remove(filepath.Join(os.TempDir(), "claudewatch-usage.json"))
 
@@ -171,14 +183,54 @@ func uninstall() error {
 
 	fmt.Printf("Uninstalled claudewatch\n")
 	fmt.Printf("  removed statusLine from %s\n", settingsPath)
-	fmt.Printf("  removed config dir %s\n", cfgDir)
+	fmt.Printf("  kept config at ~/.config/claudewatch/config.toml\n")
 	if binPath != "" {
 		fmt.Printf("  removed binary %s\n", binPath)
 	}
 	fmt.Printf("\nRestart Claude Code to apply.\n")
 	return nil
 }
 
+func update() error {
+	// Show current version.
+	currentVersion := version()
+	fmt.Printf("Current version: %s\n", currentVersion)
+
+	// Fetch and install latest.
+	fmt.Printf("Fetching latest version...\n")
+	cmd := exec.Command("go", "install", "github.com/nitintf/claudewatch@latest")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("go install failed: %w", err)
+	}
+
+	// Show new version.
+	out, err := exec.Command("claudewatch", "version").Output()
+	if err == nil {
+		fmt.Printf("Updated to: %s", string(out))
+	}
+
+	// Re-register to update binary path in settings.
+	if err := install(); err != nil {
+		return fmt.Errorf("re-registering: %w", err)
+	}
+
+	return nil
+}
+
+func version() string {
+	info, ok := debug.ReadBuildInfo()
+	if !ok || info.Main.Version == "" || info.Main.Version == "(devel)" {
+		return "dev"
+	}
+	return info.Main.Version
+}
+
+func printVersion() {
+	fmt.Println(version())
+}
+
 func gitBranch() (string, error) {
 	out, err := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD").Output()
 	if err != nil {

skills/config/SKILL.md

@@ -4,24 +4,70 @@ description: Configure claudewatch status line settings interactively
 allowed-tools: Bash, Read, Write, AskUserQuestion
 ---
 
-Configure the claudewatch status line. Read the current config from `~/.config/claudewatch/config.toml` first to show current values, then ask the user what they want to change.
+Configure the claudewatch status line. Read the current config from `~/.config/claudewatch/config.toml` first to show ALL current values to the user.
 
-## Questions to ask
+## Step 1: Show current config
 
-Ask the question, showing the current value as context:
+Read and display the full current config as a formatted summary, e.g.:
 
-1. **Theme** — Which theme?
-   Options: dracula, catppuccin-mocha, catppuccin-latte, nord, tokyo-night, gruvbox, solarized-dark, solarized-light, one-dark, rosepine
-   Show current value.
+```
+Current claudewatch config:
+  theme       = dracula
+  show_plan   = true
+  show_5h     = true
+  show_7d     = true
+  show_extra  = true
+  show_cost   = false
+  show_cwd    = false
+  show_branch = false
+```
+
+## Step 2: Ask what to change
+
+Ask the user what they want to configure:
+- **Theme** — Change the color theme
+- **Segments** — Toggle which segments are shown/hidden
+- **Both** — Change theme and segments
+
+## Step 3a: Theme (if selected)
+
+Ask which theme. Show ALL 10 options:
+dracula, catppuccin-mocha, catppuccin-latte, nord, tokyo-night, gruvbox, solarized-dark, solarized-light, one-dark, rosepine
+
+Since AskUserQuestion only supports 4 options, split into two questions:
+1. First ask with 4 popular options + indicate "Other" for more
+2. If they pick "Other", show the remaining themes
+
+## Step 3b: Segments (if selected)
+
+Show all segment toggles with their current values. Ask which segments to toggle (multi-select):
+- show_plan (Plan name in model bracket)
+- show_5h (5-hour usage quota)
+- show_7d (7-day usage quota)
+- show_extra (Pay-as-you-go extra usage)
+- show_cost (Session cost)
+- show_cwd (Working directory name)
+- show_branch (Git branch)
+
+Note: model name and context window are always shown and cannot be disabled.
+
+Selected segments will be TOGGLED (true→false, false→true).
 
-## After collecting answers
+## Step 4: Write config
 
-Write the updated config to `~/.config/claudewatch/config.toml`:
+Write the FULL updated config to `~/.config/claudewatch/config.toml` with ALL keys explicitly set. Example:
 
 ```toml
-theme = "<theme>"
+theme = "dracula"
+show_plan = true
+show_5h = true
+show_7d = true
+show_extra = true
+show_cost = false
+show_cwd = false
+show_branch = false
 ```
 
-Tell the user the config has been updated. If they changed the theme, tell them to restart Claude Code to see the new theme.
+## Step 5: Confirm
 
-Note: Plan type and usage limits are auto-detected from your Claude Code credentials — no configuration needed.
+Show the updated config summary. If the theme changed, tell them to restart Claude Code. Segment changes take effect on the next status line refresh (automatic).

skills/setup/SKILL.md

@@ -12,16 +12,13 @@ Install claudewatch — a themed status line for Claude Code.
 
 2. **Install binary**: Run `go install github.com/nitintf/claudewatch@latest`
 
-3. **Register with Claude Code**: Run `claudewatch install`
+3. **Register with Claude Code**: Run `claudewatch install` — this also creates the default config file with all keys.
 
 4. **Verify**: Read `~/.claude/settings.json` and confirm statusLine is set.
 
 5. **Choose theme**: Ask which theme they want:
-   Options: dracula, catppuccin-mocha, catppuccin-latte, nord, tokyo-night, gruvbox, solarized-dark, solarized-light, one-dark, rosepine
+   Options: dracula (default), catppuccin-mocha, catppuccin-latte, nord, tokyo-night, gruvbox, solarized-dark, solarized-light, one-dark, rosepine
 
-6. **Write config**: Write to `~/.config/claudewatch/config.toml`:
-   ```toml
-   theme = "<chosen-theme>"
-   ```
+6. **Write config**: Read the existing config from `~/.config/claudewatch/config.toml`, update only the theme value, and write it back preserving all other keys.
 
-7. **Done**: Tell the user to restart Claude Code. Plan type and usage limits are auto-detected from credentials — no configuration needed.
+7. **Done**: Tell the user to restart Claude Code. Plan type and usage limits are auto-detected from credentials. Mention they can run `/claudewatch:config` to toggle individual segments on/off.

skills/uninstall/SKILL.md

@@ -8,10 +8,8 @@ Uninstall claudewatch from Claude Code.
 
 ## Steps
 
-1. **Confirm**: Ask the user if they are sure they want to uninstall claudewatch. This will remove the status line, config, and cache.
+1. **Confirm**: Ask the user if they are sure they want to uninstall claudewatch. This will remove the status line, cache, and binary. Config is preserved at `~/.config/claudewatch/config.toml` for future reinstalls.
 
-2. **Run uninstall**: Run `claudewatch uninstall`
+2. **Run uninstall**: Run `claudewatch uninstall` — this removes the statusLine from settings, clears the cache, and removes the binary. Config is kept.
 
-3. **Remove binary**: Run `rm -f $(which claudewatch)`
-
-4. **Done**: Tell the user claudewatch has been fully removed. Restart Claude Code to apply.
+3. **Done**: Tell the user claudewatch has been removed. Config was preserved at `~/.config/claudewatch/` in case they reinstall. Restart Claude Code to apply.