Sync accepted GitHop state and prompt records

This commit is contained in:
Hop
2026-07-12 01:57:25 +00:00
parent e5bb6a5600
commit b780eadd33
164 changed files with 4811 additions and 12224 deletions
@@ -0,0 +1,17 @@
{
"id": "P_06FN70A6M7ZW50T52HXH3DR",
"task_id": "T_06FN6VQDZET3E5FH6B4D4N8",
"attempt_id": "AT_06FN70A6M65ZVCJ8K8D7TJ0",
"state_id": "P_06FN70A6M7ZW50T52HXH3DR",
"prompt": "Resolve proposal R_06FN7084GN5GMBHX5WCP5YG (Give the Prompts navigation tab a distinct prompt-bubble icon) against accepted state A_06FN6YW9ZERA9DGEPBNNXX8 (Force the latest Prompts client to load after partial-page navigation). Preserve both compatible intents. Inspect both input states for structural, delete/rename, mode, symlink, or binary conflicts that may have no text markers; resolve every conflict intentionally, remove all merge markers, run hop check, propose the result, and land it without asking the user to coordinate the merge. Conflict candidates: .hop/records/prompts/P_06FN6VQDZFJ89DSE4820W98.json, deploy/gitea/templates/custom/footer.tmpl",
"agent_name": "codex",
"status": "reconciling",
"response_summary": "hop-reconciliation-conflicts:[\".hop/records/prompts/P_06FN6VQDZFJ89DSE4820W98.json\",\"deploy/gitea/templates/custom/footer.tmpl\"]",
"created_at": "2026-07-11T23:26:48.993725Z",
"metadata": {
"source_tree": "48a0ecdbb41a845a70f061b183565ab15ae21ad3",
"git_commit": "cc9878066ed488dd3a54f349d87d98345262ccb5",
"attempt_head": "P_06FN70A6M7ZW50T52HXH3DR",
"attempt_head_kind": "prompt"
}
}