- Move cmd/core/cmd/* to cmd/* (flatten directory structure) - Update module path from github.com/host-uk/core/cmd/core to github.com/host-uk/core - Remove go.mod files from pkg/* (single module now) - Simplify pkg/mcp to file operations only (no GUI deps) - GUI features (display, webview, process) stay in core-gui/pkg/mcp - Fix import aliases (sdkpkg) for package name conflicts - Remove old backup directory (cmdbk) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
172 lines
4.5 KiB
Go
172 lines
4.5 KiB
Go
package dev
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
|
|
"github.com/host-uk/core/pkg/git"
|
|
"github.com/host-uk/core/pkg/repos"
|
|
"github.com/leaanthony/clir"
|
|
)
|
|
|
|
// AddCommitCommand adds the 'commit' command to the given parent command.
|
|
func AddCommitCommand(parent *clir.Command) {
|
|
var registryPath string
|
|
var all bool
|
|
|
|
commitCmd := parent.NewSubCommand("commit", "Claude-assisted commits across repos")
|
|
commitCmd.LongDescription("Uses Claude to create commits for dirty repos.\n" +
|
|
"Shows uncommitted changes and invokes Claude to generate commit messages.")
|
|
|
|
commitCmd.StringFlag("registry", "Path to repos.yaml (auto-detected if not specified)", ®istryPath)
|
|
commitCmd.BoolFlag("all", "Commit all dirty repos without prompting", &all)
|
|
|
|
commitCmd.Action(func() error {
|
|
return runCommit(registryPath, all)
|
|
})
|
|
}
|
|
|
|
func runCommit(registryPath string, all bool) error {
|
|
ctx := context.Background()
|
|
|
|
// Find or use provided registry, fall back to directory scan
|
|
var reg *repos.Registry
|
|
var err error
|
|
|
|
if registryPath != "" {
|
|
reg, err = repos.LoadRegistry(registryPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to load registry: %w", err)
|
|
}
|
|
fmt.Printf("%s %s\n", dimStyle.Render("Registry:"), registryPath)
|
|
} else {
|
|
registryPath, err = repos.FindRegistry()
|
|
if err == nil {
|
|
reg, err = repos.LoadRegistry(registryPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to load registry: %w", err)
|
|
}
|
|
fmt.Printf("%s %s\n", dimStyle.Render("Registry:"), registryPath)
|
|
} else {
|
|
// Fallback: scan current directory
|
|
cwd, _ := os.Getwd()
|
|
reg, err = repos.ScanDirectory(cwd)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to scan directory: %w", err)
|
|
}
|
|
fmt.Printf("%s %s\n", dimStyle.Render("Scanning:"), cwd)
|
|
registryPath = cwd
|
|
}
|
|
}
|
|
|
|
// Build paths and names for git operations
|
|
var paths []string
|
|
names := make(map[string]string)
|
|
|
|
for _, repo := range reg.List() {
|
|
if repo.IsGitRepo() {
|
|
paths = append(paths, repo.Path)
|
|
names[repo.Path] = repo.Name
|
|
}
|
|
}
|
|
|
|
if len(paths) == 0 {
|
|
fmt.Println("No git repositories found.")
|
|
return nil
|
|
}
|
|
|
|
// Get status for all repos
|
|
statuses := git.Status(ctx, git.StatusOptions{
|
|
Paths: paths,
|
|
Names: names,
|
|
})
|
|
|
|
// Find dirty repos
|
|
var dirtyRepos []git.RepoStatus
|
|
for _, s := range statuses {
|
|
if s.Error == nil && s.IsDirty() {
|
|
dirtyRepos = append(dirtyRepos, s)
|
|
}
|
|
}
|
|
|
|
if len(dirtyRepos) == 0 {
|
|
fmt.Println("No uncommitted changes found.")
|
|
return nil
|
|
}
|
|
|
|
// Show dirty repos
|
|
fmt.Printf("\n%d repo(s) with uncommitted changes:\n\n", len(dirtyRepos))
|
|
for _, s := range dirtyRepos {
|
|
fmt.Printf(" %s: ", repoNameStyle.Render(s.Name))
|
|
if s.Modified > 0 {
|
|
fmt.Printf("%s ", dirtyStyle.Render(fmt.Sprintf("%d modified", s.Modified)))
|
|
}
|
|
if s.Untracked > 0 {
|
|
fmt.Printf("%s ", dirtyStyle.Render(fmt.Sprintf("%d untracked", s.Untracked)))
|
|
}
|
|
if s.Staged > 0 {
|
|
fmt.Printf("%s ", aheadStyle.Render(fmt.Sprintf("%d staged", s.Staged)))
|
|
}
|
|
fmt.Println()
|
|
}
|
|
|
|
// Confirm unless --all
|
|
if !all {
|
|
fmt.Println()
|
|
if !confirm("Have Claude commit these repos?") {
|
|
fmt.Println("Aborted.")
|
|
return nil
|
|
}
|
|
}
|
|
|
|
fmt.Println()
|
|
|
|
// Commit each dirty repo
|
|
var succeeded, failed int
|
|
for _, s := range dirtyRepos {
|
|
fmt.Printf("%s %s\n", dimStyle.Render("Committing"), s.Name)
|
|
|
|
if err := claudeCommit(ctx, s.Path, s.Name, registryPath); err != nil {
|
|
fmt.Printf(" %s %s\n", errorStyle.Render("✗"), err)
|
|
failed++
|
|
} else {
|
|
fmt.Printf(" %s committed\n", successStyle.Render("✓"))
|
|
succeeded++
|
|
}
|
|
fmt.Println()
|
|
}
|
|
|
|
// Summary
|
|
fmt.Printf("%s %d succeeded", successStyle.Render("Done:"), succeeded)
|
|
if failed > 0 {
|
|
fmt.Printf(", %s", errorStyle.Render(fmt.Sprintf("%d failed", failed)))
|
|
}
|
|
fmt.Println()
|
|
|
|
return nil
|
|
}
|
|
|
|
// claudeCommit is defined in work.go but we need it here too
|
|
// This version includes better output handling
|
|
func claudeCommitWithOutput(ctx context.Context, repoPath, repoName, registryPath string) error {
|
|
// Load AGENTS.md context if available
|
|
agentsPath := filepath.Join(filepath.Dir(registryPath), "AGENTS.md")
|
|
var agentContext string
|
|
if data, err := os.ReadFile(agentsPath); err == nil {
|
|
agentContext = string(data) + "\n\n"
|
|
}
|
|
|
|
prompt := agentContext + "Review the uncommitted changes and create an appropriate commit. " +
|
|
"Use Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>. Be concise."
|
|
|
|
cmd := exec.CommandContext(ctx, "claude", "-p", prompt, "--allowedTools", "Bash,Read,Glob,Grep")
|
|
cmd.Dir = repoPath
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stderr
|
|
cmd.Stdin = os.Stdin
|
|
|
|
return cmd.Run()
|
|
}
|