GnosysLabs/GitHop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve alpha4 integration while preserving accepted Hop behavior

Browse Source 
Hop-State: A_06FN4YF9MKR7SWE1Y7GZDJR
Hop-Proposal: R_06FN4YEJF4PMSYPMQ7T3SBG
Hop-Task: T_06FN3MBF98GWD4NA5PA1RWG
Hop-Attempt: AT_06FN4XMZP6EPRVNAAQWA8K8
This commit is contained in:
Hop
2026-07-11 11:39:09 -07:00
parent 4c0c504935
commit 23a4891099
12 changed files with 1304 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/hop/cli.go
+56 -2
View File
@@ -22,6 +22,7 @@ Usage:
hop propose [--summary TEXT] STATE
hop accept STATE [-- COMMAND [ARG...]]
hop land STATE [-- COMMAND [ARG...]]
hop refresh PROPOSAL
hop sync
hop status
hop graph
@@ -38,7 +39,7 @@ Usage:
Add --json anywhere for machine-readable output.
`
const Version = "0.1.0-alpha.3"
const Version = "0.1.0-alpha.4"
func RunCLI(args []string, stdout, stderr io.Writer) int {
return RunCLIWithInput(args, os.Stdin, stdout, stderr)
@@ -266,6 +267,28 @@ func RunCLIWithInput(args []string, stdin io.Reader, stdout, stderr io.Writer) i
result, err := service.Land(ctx, stateID, argv)
value = result
if err != nil {
var conflict *ConflictError
if errors.As(err, &conflict) {
refresh, refreshErr := service.Refresh(ctx, stateID)
if refreshErr != nil {
preparationErr := fmt.Errorf("automatic merge conflict detected (%v), but reconciliation preparation failed: %v", err, refreshErr)
return printCLIError(preparationErr, jsonOutput, stdout, stderr)
}
if jsonOutput {
writeJSON(stdout, map[string]any{
"ok": false,
"error": err.Error(),
"exit_code": 20,
"conflict": conflict,
"reconciliation": refresh,
"next_command": "resolve the returned workspace, then check, propose, and land using the returned prompt state",
})
return 20
}
fmt.Fprintf(stderr, "hop: %v\n", err)
printRefreshSummary(stdout, refresh)
return 20
}
return printCLIError(err, jsonOutput, stdout, stderr)
}
if !jsonOutput {
@@ -279,6 +302,20 @@ func RunCLIWithInput(args []string, stdin io.Reader, stdout, stderr io.Writer) i
}
}
case "refresh", "reconcile":
if len(commandArgs) != 1 {
fmt.Fprintln(stderr, "usage: hop refresh PROPOSAL")
return 2
}
result, err := service.Refresh(ctx, commandArgs[0])
value = result
if err != nil {
return printCLIError(err, jsonOutput, stdout, stderr)
}
if !jsonOutput {
printRefreshSummary(stdout, result)
}
case "sync":
if len(commandArgs) != 0 {
fmt.Fprintln(stderr, "usage: hop sync")
@@ -529,7 +566,7 @@ func printCLIError(err error, jsonOutput bool, stdout, stderr io.Writer) int {
} else {
fmt.Fprintf(stderr, "hop: %v\n", err)
if conflict != nil && len(conflict.Paths) > 0 {
fmt.Fprintln(stderr, "Overlapping paths:")
fmt.Fprintln(stderr, "Merge conflicts:")
for _, path := range conflict.Paths {
fmt.Fprintf(stderr, " %s\n", path)
}
@@ -544,6 +581,23 @@ func printCLIError(err error, jsonOutput bool, stdout, stderr io.Writer) int {
return code
}
func printRefreshSummary(w io.Writer, result RefreshResult) {
action := "Prepared"
if result.Reused {
action = "Reusing"
}
fmt.Fprintf(w, "%s reconciliation prompt %s\n", action, result.Prompt.ID)
fmt.Fprintf(w, "Reconciliation attempt: %s\n", result.Attempt.ID)
fmt.Fprintf(w, "Workspace: %s\n", result.Workspace)
fmt.Fprintf(w, "Accepted input: %s · commit %s\n", result.AcceptedHead.ID, shortHash(result.AcceptedHead.GitCommit))
fmt.Fprintf(w, "Proposal input: %s · commit %s\n", result.Proposal.ID, shortHash(result.Proposal.GitCommit))
fmt.Fprintln(w, "Resolve these genuine merge conflicts while preserving both intents (structural conflicts may have no text markers):")
for _, path := range result.Conflicts {
fmt.Fprintf(w, " %s\n", path)
}
fmt.Fprintf(w, "Continue automatically with: hop check %s -- <test-command>, then propose and land again.\n", result.Prompt.ID)
}
func removeFlag(args []string, wanted string) (bool, []string) {
found := false
filtered := make([]string, 0, len(args))