Skip to content

Commit 3fcefff

Browse files
chore: create bug dso-jjli — merge-to-main.sh phase naming misleads agents
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ea96994 commit 3fcefff

2 files changed

Lines changed: 32 additions & 0 deletions

File tree

.tickets/.index.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"dso-jjli": {
3+
"deps": [],
4+
"priority": 2,
5+
"status": "open",
6+
"title": "merge-to-main.sh 'merge' phase name misleads agents into thinking code is on main",
7+
"type": "bug"
8+
}
9+
}

.tickets/dso-jjli.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
id: dso-jjli
3+
status: open
4+
deps: []
5+
links: []
6+
created: 2026-03-22T16:56:07Z
7+
type: bug
8+
priority: 2
9+
assignee: Joe Oakhart
10+
---
11+
# merge-to-main.sh 'merge' phase name misleads agents into thinking code is on main
12+
13+
The 'merge' phase of merge-to-main.sh performs a git merge of the worktree branch INTO main locally, but agents interpret 'merge phase complete' as meaning their code is already on main and accessible. In reality, the code still needs to be pushed (the 'push' phase). This naming confusion causes agents to skip or misunderstand the push step. The phase should be renamed to something clearer like 'local-merge' or 'integrate' to distinguish it from 'code is on main/remote'. Additionally, the push phase has a bug: it tries to push the current branch (the worktree branch) instead of main, failing when the worktree branch has no upstream.
14+
15+
16+
## Notes
17+
18+
<!-- note-id: lmsgrnfe -->
19+
<!-- timestamp: 2026-03-22T16:56:45Z -->
20+
<!-- origin: agent -->
21+
<!-- sync: unsynced -->
22+
23+
Scope expansion: all phases should be renamed for clarity, not just 'merge'. Agents also misinterpret the 'push' phase — it currently tries to push the current branch (worktree) instead of main, and agents don't understand which ref is being pushed. The full phase list (sync, merge, validate, push, archive, ci_trigger) should be reviewed and renamed to clearly communicate what each phase actually does from the agent's perspective. For example: 'merge' could become 'local-integrate', 'push' could become 'push-main-to-remote', etc.

0 commit comments

Comments
 (0)