deepseek-harness/apps/web/tests/expected/forge-panel/merge-menu.expected.md at dec3a642dfd62e11e77bb5b81a117fe5bd004e86

0 Fork 0

Files

T

Yichen Jiang 80254034c7 feat(forge): mark change requests ready and merge them from the panel

An expanded card now marks a draft ready for review and merges a change
request that the host would merge now:

- The forge seam gains provider actions `markReady` and `merge`, which
  return a typed `ForgeActionFailure`; the registry polls a watched change
  request at once after either settles. Snapshots carry `mergeReady` and
  the `mergeMethods` the repository allows, the user's usual one first.
- GitHub marks ready with `gh pr ready` and merges through the REST merge
  endpoint with the head SHA the card showed, so new commits refuse the
  merge; it never enables auto-merge, joins a merge queue, or deletes the
  head branch.
- The panel Remote acts only on visible bindings of the Session, and the
  card offers 标记为可评审 for drafts and a 合并 menu with the allowed
  methods and a confirmation, reporting each outcome in a toast.
- The forge panel e2e replaces the worktree branch before the ARIA
  capture normalizes durations, so a random suffix no longer breaks it.

2026-10-20 11:50:10 +08:00

290 B

Raw Blame History

menu:
- text: "将 #9 合并到 main"
- menuitem "压缩合并把全部提交压缩成一个提交"
- menuitem "创建合并提交保留全部提交，并新增一个合并提交"
- menuitem "变基合并把提交逐个变基到 main"
- separator
- menuitem "确认合并"

290 B Raw Blame History

290 B

Raw Blame History