lsm / HyperNeo / 30776677727

83%

Build Type

push

github

Committed by web-flow

Commit Message

fix(space): make root-repo sync an explicit post-approval merge step (#2310)

* fix(space): make root-repo sync an explicit post-approval merge step

Step 5 of PR_MERGE_POST_APPROVAL_INSTRUCTIONS claimed root-repo sync is
'handled outside the isolated worktree' — false, since the reviewer
post-approval session is the only actor that runs it. The disclaim caused
a reviewer to skip syncing the root repo after merging PR #2307.

Replace it with an explicit 'git -C <mainRepoPath> pull --ff-only origin dev'
(the banner names that path as 'Main repository' and permits writes under
post-approval). Keep the worktree-safe 'git fetch origin dev'; mirror step 4's
best-effort cleanup_warning handling if the ff-only fails.

* fix(space): derive root-repo path from git in post-approval sync step

Round-1 step 5 referenced the worktree-isolation banner and a literal
<mainRepoPath> to name the root path — both broken for the post-approval
reviewer session, which has no session.worktree (worker sub-session via
createCustomAgentInit), so QueryOptionsBuilder never appends the banner and
<mainRepoPath> is not an interpolation token. The reviewer would run it
verbatim, fail, and leave the root stale — the exact regression intended.

Derive the root from git instead: ROOT from the worktree's shared common
dir parent. Add guards: refuse a root not on dev (pull --ff-only moves the
current branch), refuse to claim sync when local dev is ahead of origin/dev
('Already up to date' hides stray commits), keep best-effort cleanup_warning
on pull failure. Also run the sync on step 1's already-merged path so a
restart after merge still syncs the root.

* fix(space): make post-approval merge template branch-agnostic

These are product built-ins (Coding/Research/QA) that run against arbitrary
user repos, but the merge template hard-coded `dev` everywhere — breaking any
repo whose base branch is main/master or a release branch.

Derive the base up front from the PR's baseRefName (the br... (continued)

Coverage Stats

12361 of 17611 branches covered (70.19%)

Branch coverage included in aggregate %.

57 of 57 new or added lines in 1 file covered. (100.0%)

1 existing line in 1 file now uncovered.

105541 of 124095 relevant lines covered (85.05%)

300.1 hits per line