feat: /branch /pr /stash /usage, categorized /help, 37 commands total

- /branch: create, switch, list branches via agent
- /pr: create pull request via gh
- /stash: save, pop, list stashes
- /usage: detailed API usage with per-model breakdown
- /help: reorganized into 5 categories (Core, Git, Tools, Session, Config)
- Total: 37 slash commands

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: idoubi

internal/slash/commands.go

@@ -885,6 +885,118 @@ func (h *Handler) retryCmd(args []string) Result {
 	return Result{Message: "No previous user message to retry."}
 }
 
+// ─── /branch ──────────────────────────────────────
+
+func (h *Handler) branchCmd(args []string) Result {
+	if len(args) == 0 {
+		return Result{
+			SkillPrompt: "Show the current git branch and list recent branches. For each branch, show its last commit.",
+		}
+	}
+	action := args[0]
+	switch action {
+	case "new", "create":
+		if len(args) < 2 {
+			return Result{Message: "Usage: /branch new <name>"}
+		}
+		return Result{
+			SkillPrompt: fmt.Sprintf("Create a new git branch named %q from the current branch and switch to it.", args[1]),
+		}
+	case "switch", "checkout":
+		if len(args) < 2 {
+			return Result{Message: "Usage: /branch switch <name>"}
+		}
+		return Result{
+			SkillPrompt: fmt.Sprintf("Switch to git branch %q.", args[1]),
+		}
+	default:
+		return Result{
+			SkillPrompt: fmt.Sprintf("Git branch operation: %s", strings.Join(args, " ")),
+		}
+	}
+}
+
+// ─── /pr ──────────────────────────────────────────
+
+func (h *Handler) prCmd(args []string) Result {
+	desc := strings.Join(args, " ")
+	prompt := "Create a pull request for the current branch."
+	if desc != "" {
+		prompt += fmt.Sprintf("\n\nDescription: %s", desc)
+	}
+	prompt += "\n\nSteps:\n1. Check current branch and diff against main\n2. Push the branch if needed\n3. Create the PR with a good title and description using `gh pr create`"
+	return Result{SkillPrompt: prompt}
+}
+
+// ─── /stash ───────────────────────────────────────
+
+func (h *Handler) stashCmd(args []string) Result {
+	if len(args) == 0 {
+		return Result{
+			SkillPrompt: "Show the current git stash list. If there are stashed changes, show what each stash contains.",
+		}
+	}
+	switch args[0] {
+	case "save", "push":
+		msg := strings.Join(args[1:], " ")
+		if msg == "" {
+			msg = "WIP"
+		}
+		return Result{
+			SkillPrompt: fmt.Sprintf("Stash current changes with message: %q", msg),
+		}
+	case "pop", "apply":
+		return Result{
+			SkillPrompt: "Apply the most recent git stash (pop).",
+		}
+	default:
+		return Result{
+			SkillPrompt: fmt.Sprintf("Git stash operation: %s", strings.Join(args, " ")),
+		}
+	}
+}
+
+// ─── /usage ───────────────────────────────────────
+
+func (h *Handler) usageCmd(args []string) Result {
+	a := h.app.GetAgent()
+	if a == nil {
+		return Result{Message: "No active session."}
+	}
+
+	var b strings.Builder
+	b.WriteString("API usage:\n\n")
+
+	tracker := a.CostTracker()
+	if tracker != nil {
+		b.WriteString(fmt.Sprintf("  Total cost:    %s\n", tracker.FormatCost()))
+		in, out := tracker.TotalTokens()
+		b.WriteString(fmt.Sprintf("  Input tokens:  %d\n", in))
+		b.WriteString(fmt.Sprintf("  Output tokens: %d\n", out))
+		b.WriteString(fmt.Sprintf("  Total tokens:  %d\n", in+out))
+
+		// Per-model breakdown
+		allUsage := tracker.AllModelUsage()
+		if len(allUsage) > 0 {
+			b.WriteString("\n  By model:\n")
+			for model, usage := range allUsage {
+				b.WriteString(fmt.Sprintf("    %s: $%.4f (%d in / %d out)\n",
+					model, usage.CostUSD, usage.InputTokens, usage.OutputTokens))
+			}
+		}
+
+		stats := tracker.Stats()
+		if dur, ok := stats["totalAPIDuration"]; ok {
+			b.WriteString(fmt.Sprintf("\n  API time:      %v\n", dur))
+		}
+		if dur, ok := stats["totalToolDuration"]; ok {
+			b.WriteString(fmt.Sprintf("  Tool time:     %v\n", dur))
+		}
+	}
+
+	return Result{Message: b.String()}
+}
+
 // ─── helpers ──────────────────────────────────────
 
 func min(a, b int) int {

internal/slash/slash.go

@@ -89,6 +89,11 @@ func AllCommands() []CommandDef {
 		{Name: "/copy", Description: "Copy last response to clipboard"},
 		{Name: "/stats", Description: "Detailed session statistics"},
 		{Name: "/retry", Description: "Retry last message"},
+		{Name: "/usage", Description: "Detailed API usage breakdown"},
+		// More Git
+		{Name: "/branch", Description: "Git branch management", HasArgs: true},
+		{Name: "/pr", Description: "Create pull request", HasArgs: true},
+		{Name: "/stash", Description: "Git stash management", HasArgs: true},
 	}
 }
 
@@ -208,6 +213,14 @@ func (h *Handler) Handle(input string) Result {
 		return h.statsCmd(args)
 	case "/retry":
 		return h.retryCmd(args)
+	case "/usage":
+		return h.usageCmd(args)
+	case "/branch":
+		return h.branchCmd(args)
+	case "/pr":
+		return h.prCmd(args)
+	case "/stash":
+		return h.stashCmd(args)
 	default:
 		// Try skill invocation
 		if result, ok := h.HandleSkillInvocation(cmd, args); ok {
@@ -219,25 +232,56 @@ func (h *Handler) Handle(input string) Result {
 
 func (h *Handler) help() Result {
 	var b strings.Builder
-	b.WriteString("Available commands:\n")
-	for _, cmd := range AllCommands() {
-		aliases := ""
-		if len(cmd.Aliases) > 0 {
-			aliases = " (" + strings.Join(cmd.Aliases, ", ") + ")"
-		}
-		b.WriteString(fmt.Sprintf("  %-16s %s%s\n", cmd.Name, cmd.Description, aliases))
-	}
-	b.WriteString("\nKeyboard shortcuts:\n")
-	b.WriteString("  Enter            Send message\n")
-	b.WriteString("  Shift+Enter      New line\n")
-	b.WriteString("  Ctrl+C           Cancel query / Exit\n")
-	b.WriteString("  Ctrl+D           Exit (when input empty)\n")
-	b.WriteString("  Ctrl+L           Clear conversation\n")
-	b.WriteString("  Ctrl+O           Toggle expand tool output\n")
-	b.WriteString("  Up/Down          Input history / Scroll\n")
-	b.WriteString("  PgUp/PgDown      Scroll messages\n")
-	b.WriteString("  Esc              Clear input\n")
-	b.WriteString("  ! <cmd>          Run shell command\n")
+
+	b.WriteString("Core:\n")
+	b.WriteString("  /help          Show this help\n")
+	b.WriteString("  /clear         Clear conversation\n")
+	b.WriteString("  /compact       Compact with optional instructions\n")
+	b.WriteString("  /model [name]  Show or change model\n")
+	b.WriteString("  /fast          Toggle faster model\n")
+	b.WriteString("  /plan [task]   Toggle plan mode / plan a task\n")
+	b.WriteString("  /quit          Exit\n")
+
+	b.WriteString("\nGit & Code:\n")
+	b.WriteString("  /commit [msg]  Create git commit\n")
+	b.WriteString("  /review        Code review\n")
+	b.WriteString("  /diff          Show git diff summary\n")
+	b.WriteString("  /branch        Branch management\n")
+	b.WriteString("  /pr [desc]     Create pull request\n")
+	b.WriteString("  /stash         Stash management\n")
+	b.WriteString("  /bug <desc>    Investigate a bug\n")
+	b.WriteString("  /test          Run tests\n")
+
+	b.WriteString("\nTools & Context:\n")
+	b.WriteString("  /mcp           Manage MCP servers\n")
+	b.WriteString("  /skills        List skills\n")
+	b.WriteString("  /plugin        List plugins\n")
+	b.WriteString("  /hooks         Show hooks\n")
+	b.WriteString("  /context       Show context sources\n")
+	b.WriteString("  /init          Initialize project\n")
+
+	b.WriteString("\nSession:\n")
+	b.WriteString("  /cost          Cost and token usage\n")
+	b.WriteString("  /usage         Detailed API usage\n")
+	b.WriteString("  /stats         Session statistics\n")
+	b.WriteString("  /session       Session details\n")
+	b.WriteString("  /files         Files accessed\n")
+	b.WriteString("  /resume        Recent sessions\n")
+	b.WriteString("  /export        Export conversation\n")
+	b.WriteString("  /copy          Copy last response\n")
+	b.WriteString("  /retry         Retry last message\n")
+
+	b.WriteString("\nConfig:\n")
+	b.WriteString("  /config        Show configuration\n")
+	b.WriteString("  /permissions   Permission mode\n")
+	b.WriteString("  /login <key>   Set API key\n")
+	b.WriteString("  /logout        Remove API key\n")
+	b.WriteString("  /doctor        Environment check\n")
+	b.WriteString("  /theme         Color theme\n")
+
+	b.WriteString("\nKeys: Enter send · Shift+Enter newline · Ctrl+C cancel · Ctrl+L clear")
+	b.WriteString("\n      Ctrl+O expand · PgUp/Down scroll · !cmd shell · Tab complete")
+
 	return Result{Message: b.String()}
 }