Skip to content

docs(agent): require merge confirmation #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gaubee merged 2 commits into from
Dec 25, 2025
Merged

docs(agent): require merge confirmation #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753aaf4
docs(agent): require merge confirmation
Gaubee Dec 25, 2025
725b4f4
Merge branch 'main' into feat/agent-merge-guard
Gaubee Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ gh pr merge <pr#> --squash --delete-branch
pnpm agent worktree delete <name>
```

合并门禁（必须执行）：
- **在合并之前必须询问用户**，并明确告知当前工作目录（worktree 路径）。
- 用户 review 确认后才允许执行合并。

---

## 重要提醒
Expand Down
1 change: 1 addition & 0 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,6 @@ gh pr create --body "Closes #28"
- 所有业务逻辑必须有单元测试
- 使用 TypeScript 严格模式
- PR 描述使用 `Closes #issue编号` 自动关联任务
- 合并前必须告知当前 worktree 路径并征求用户确认

</coding_guidelines>
1 change: 1 addition & 0 deletions scripts/agent/readme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ pnpm agent worktree list worktree 概览
pnpm agent worktree delete <name> [--force]

PR 规则: 描述中使用 Closes #issue编号 自动关联
合并门禁: 合并前必须告知当前 worktree 路径并征求用户确认
`)
}

Expand Down