root/Jyotisha
1
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects Releases Wiki Activity

tools(agent-loop): Claude merges a stale branch itself when only docs conflict

Browse Source 
Product owner chose option A on Jyotisha #53 (2026-10-13): being behind
staging with a docs-only merge is not a bounce and does not count toward
the two-bounce escalation. Code conflicts still go back to Grok.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LutgzyJqNhPpZy1nFsJtN3
This commit is contained in:
Jesse_Chen
2026-10-13 18:49:03 +08:00
co-authored by Claude Opus 5.5
parent 3cc7fe23d1
commit 856bc850ba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/agent-loop/README.md
+1 -1
View File
@@ -10,7 +10,7 @@ Claude（开发机，Linux）负责规划与验收，Grok Build（产品负责
| --- | --- | --- |
| `agent/待规划` | Claude：诊断 → 任务书推 staging | `agent/待执行` 或 `agent/需拍板` |
| `agent/待执行` | Grok：按任务书在 `codex/*` 实现、自测、推分支 | `agent/待验收` 或 `agent/需拍板` |
| `agent/待验收` | Claude：只验 Grok 回报的 SHA | 通过 → 推 staging → `agent/部署中`；不通过 → 修复单 → `agent/待执行`（打回 2 次 → `agent/需拍板`） |
| `agent/待验收` | Claude：只验 Grok 回报的 SHA | 通过 → 推 staging → `agent/部署中`；不通过 → 修复单 → `agent/待执行`（打回 2 次 → `agent/需拍板`）；只是落后于 staging 且合并只碰文档时，Claude 自己合并，不打回、不计次数（2026-10-13 产品决定） |
| `agent/部署中` | Claude 脚本（不用模型）：核对 `/api/health` | `agent/待真机`；3 小时未部署 → `agent/需拍板` |
| `agent/待真机` | 产品负责人 | 关 issue，或评论问题并改回 `agent/待规划` |
| `agent/需拍板` | 产品负责人 | 回复后改回原状态 |