Add RPC support for compact command (bd-184)
- Added OpCompact and OpCompactStats operation constants - Added CompactArgs, CompactStatsArgs, and response types to RPC protocol - Implemented handleCompact and handleCompactStats in RPC server - Updated compact command to use RPC when daemon is available - Fixed RPC client to include Cwd for proper database routing - Compact now works in daemon mode with --no-daemon flag Amp-Thread-ID: https://ampcode.com/threads/T-87885d07-80ad-466d-9ffb-cc96fab4853f Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
@@ -16,6 +16,7 @@ import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/beads/internal/compact"
|
||||
"github.com/steveyegge/beads/internal/storage"
|
||||
"github.com/steveyegge/beads/internal/storage/sqlite"
|
||||
"github.com/steveyegge/beads/internal/types"
|
||||
@@ -579,6 +580,10 @@ func (s *Server) handleRequest(req *Request) Response {
|
||||
resp = s.handleReposStats(req)
|
||||
case OpReposClearCache:
|
||||
resp = s.handleReposClearCache(req)
|
||||
case OpCompact:
|
||||
resp = s.handleCompact(req)
|
||||
case OpCompactStats:
|
||||
resp = s.handleCompactStats(req)
|
||||
default:
|
||||
s.metrics.RecordError(req.Operation)
|
||||
return Response{
|
||||
@@ -1599,3 +1604,279 @@ func (s *Server) handleReposClearCache(_ *Request) Response {
|
||||
Data: json.RawMessage(`{"message":"Cache cleared successfully"}`),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) handleCompact(req *Request) Response {
|
||||
var args CompactArgs
|
||||
if err := json.Unmarshal(req.Args, &args); err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("invalid compact args: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
store, err := s.getStorageForRequest(req)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get storage: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
sqliteStore, ok := store.(*sqlite.SQLiteStorage)
|
||||
if !ok {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: "compact requires SQLite storage",
|
||||
}
|
||||
}
|
||||
|
||||
config := &compact.CompactConfig{
|
||||
APIKey: args.APIKey,
|
||||
Concurrency: args.Workers,
|
||||
DryRun: args.DryRun,
|
||||
}
|
||||
if config.Concurrency <= 0 {
|
||||
config.Concurrency = 5
|
||||
}
|
||||
|
||||
compactor, err := compact.New(sqliteStore, args.APIKey, config)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to create compactor: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
ctx := s.reqCtx(req)
|
||||
startTime := time.Now()
|
||||
|
||||
if args.IssueID != "" {
|
||||
if !args.Force {
|
||||
eligible, reason, err := sqliteStore.CheckEligibility(ctx, args.IssueID, args.Tier)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to check eligibility: %v", err),
|
||||
}
|
||||
}
|
||||
if !eligible {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("%s is not eligible for Tier %d compaction: %s", args.IssueID, args.Tier, reason),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
issue, err := sqliteStore.GetIssue(ctx, args.IssueID)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get issue: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
originalSize := len(issue.Description) + len(issue.Design) + len(issue.Notes) + len(issue.AcceptanceCriteria)
|
||||
|
||||
if args.DryRun {
|
||||
result := CompactResponse{
|
||||
Success: true,
|
||||
IssueID: args.IssueID,
|
||||
OriginalSize: originalSize,
|
||||
Reduction: "70-80%",
|
||||
DryRun: true,
|
||||
}
|
||||
data, _ := json.Marshal(result)
|
||||
return Response{
|
||||
Success: true,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
if args.Tier == 1 {
|
||||
err = compactor.CompactTier1(ctx, args.IssueID)
|
||||
} else {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: "Tier 2 compaction not yet implemented",
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("compaction failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
issueAfter, _ := sqliteStore.GetIssue(ctx, args.IssueID)
|
||||
compactedSize := 0
|
||||
if issueAfter != nil {
|
||||
compactedSize = len(issueAfter.Description)
|
||||
}
|
||||
|
||||
duration := time.Since(startTime)
|
||||
result := CompactResponse{
|
||||
Success: true,
|
||||
IssueID: args.IssueID,
|
||||
OriginalSize: originalSize,
|
||||
CompactedSize: compactedSize,
|
||||
Reduction: fmt.Sprintf("%.1f%%", float64(originalSize-compactedSize)/float64(originalSize)*100),
|
||||
Duration: duration.String(),
|
||||
}
|
||||
data, _ := json.Marshal(result)
|
||||
return Response{
|
||||
Success: true,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
if args.All {
|
||||
var candidates []*sqlite.CompactionCandidate
|
||||
|
||||
if args.Tier == 1 {
|
||||
tier1, err := sqliteStore.GetTier1Candidates(ctx)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get Tier 1 candidates: %v", err),
|
||||
}
|
||||
}
|
||||
candidates = tier1
|
||||
} else if args.Tier == 2 {
|
||||
tier2, err := sqliteStore.GetTier2Candidates(ctx)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get Tier 2 candidates: %v", err),
|
||||
}
|
||||
}
|
||||
candidates = tier2
|
||||
} else {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("invalid tier: %d (must be 1 or 2)", args.Tier),
|
||||
}
|
||||
}
|
||||
|
||||
if len(candidates) == 0 {
|
||||
result := CompactResponse{
|
||||
Success: true,
|
||||
Results: []CompactResult{},
|
||||
}
|
||||
data, _ := json.Marshal(result)
|
||||
return Response{
|
||||
Success: true,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
issueIDs := make([]string, len(candidates))
|
||||
for i, c := range candidates {
|
||||
issueIDs[i] = c.IssueID
|
||||
}
|
||||
|
||||
batchResults, err := compactor.CompactTier1Batch(ctx, issueIDs)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("batch compaction failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
results := make([]CompactResult, 0, len(batchResults))
|
||||
for _, r := range batchResults {
|
||||
result := CompactResult{
|
||||
IssueID: r.IssueID,
|
||||
Success: r.Err == nil,
|
||||
OriginalSize: r.OriginalSize,
|
||||
CompactedSize: r.CompactedSize,
|
||||
}
|
||||
if r.Err != nil {
|
||||
result.Error = r.Err.Error()
|
||||
} else if r.OriginalSize > 0 && r.CompactedSize > 0 {
|
||||
result.Reduction = fmt.Sprintf("%.1f%%", float64(r.OriginalSize-r.CompactedSize)/float64(r.OriginalSize)*100)
|
||||
}
|
||||
results = append(results, result)
|
||||
}
|
||||
|
||||
duration := time.Since(startTime)
|
||||
response := CompactResponse{
|
||||
Success: true,
|
||||
Results: results,
|
||||
Duration: duration.String(),
|
||||
DryRun: args.DryRun,
|
||||
}
|
||||
data, _ := json.Marshal(response)
|
||||
return Response{
|
||||
Success: true,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: "must specify --all or --id",
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) handleCompactStats(req *Request) Response {
|
||||
var args CompactStatsArgs
|
||||
if err := json.Unmarshal(req.Args, &args); err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("invalid compact stats args: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
store, err := s.getStorageForRequest(req)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get storage: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
sqliteStore, ok := store.(*sqlite.SQLiteStorage)
|
||||
if !ok {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: "compact stats requires SQLite storage",
|
||||
}
|
||||
}
|
||||
|
||||
ctx := s.reqCtx(req)
|
||||
|
||||
tier1, err := sqliteStore.GetTier1Candidates(ctx)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get Tier 1 candidates: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
tier2, err := sqliteStore.GetTier2Candidates(ctx)
|
||||
if err != nil {
|
||||
return Response{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("failed to get Tier 2 candidates: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
stats := CompactStatsData{
|
||||
Tier1Candidates: len(tier1),
|
||||
Tier2Candidates: len(tier2),
|
||||
Tier1MinAge: "30 days",
|
||||
Tier2MinAge: "90 days",
|
||||
TotalClosed: 0, // Could query for this but not critical
|
||||
}
|
||||
|
||||
result := CompactResponse{
|
||||
Success: true,
|
||||
Stats: &stats,
|
||||
}
|
||||
data, _ := json.Marshal(result)
|
||||
return Response{
|
||||
Success: true,
|
||||
Data: data,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user