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_06FN6WXQF41XNQYEP0F67QR",
"task_id": "T_06FN6Q6CPY9NYPA25F6DKS8",
"attempt_id": "AT_06FN6WXQF509ZK786R6N7Z0",
"state_id": "P_06FN6WXQF41XNQYEP0F67QR",
"prompt": "Resolve proposal R_06FN6WVZBRQKS2051721VS0 (Publish portable Hop prompt records with the repository and render them in Prompts) against accepted state A_06FN6VDSDZSNJDKBSYY58K8 (Remove the Help link from Hop's shared top 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_06FN6TWMXN0M2QSSNZ6KRE8.json",
"agent_name": "codex",
"status": "reconciling",
"response_summary": "hop-reconciliation-conflicts:[\".hop/records/prompts/P_06FN6TWMXN0M2QSSNZ6KRE8.json\"]",
"created_at": "2026-07-11T23:12:00.377583Z",
"metadata": {
"source_tree": "ab06c502b15f48e97161c275b9dee9b17abd1e6a",
"git_commit": "de5c69da3d773bea1d76f3868b675e6538943222",
"attempt_head": "P_06FN6WXQF41XNQYEP0F67QR",
"attempt_head_kind": "prompt"
}
}