From 5fed37ecb92c73e6b04e7f5811497d1018e62f6b Mon Sep 17 00:00:00 2001 From: NagyVikt Date: Wed, 22 Apr 2026 14:25:31 +0200 Subject: [PATCH] Align split-cli cleanup command with main-based finish flow The resumed lane had lost its managed worktree, but the remote branch and proof still existed. The remaining OpenSpec cleanup step still pointed at dev even though gitguardex now finishes this branch against main, so I corrected the task log before merge. Constraint: Existing split-cli commit already published on origin and should not be rewritten Rejected: Leave tasks.md stale and rely on operator memory | merged OpenSpec artifact would keep wrong cleanup command Confidence: high Scope-risk: narrow Reversibility: clean Directive: Keep OpenSpec cleanup commands aligned with the repo's protected base branch before finish Tested: node --check bin/multiagent-safety.js; node --check src/cli/main.js src/cli/args.js src/cli/dispatch.js src/git/index.js; node --test test/doctor.test.js; node --test test/setup.test.js; node --test test/metadata.test.js; node --test test/cli-args-dispatch.test.js; openspec validate setup-current-single-repo-alias --type change --strict; openspec validate agent-codex-split-cli-main-args-dispatch-2026-04-22-13-48 --type change --strict; openspec validate --specs; node bin/multiagent-safety.js doctor --current --dry-run; node bin/multiagent-safety.js setup --current --dry-run --no-global-install Not-tested: gx branch finish merge and cleanup before it runs --- .../tasks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openspec/changes/agent-codex-split-cli-main-args-dispatch-2026-04-22-13-48/tasks.md b/openspec/changes/agent-codex-split-cli-main-args-dispatch-2026-04-22-13-48/tasks.md index e3a1475..14c04c6 100644 --- a/openspec/changes/agent-codex-split-cli-main-args-dispatch-2026-04-22-13-48/tasks.md +++ b/openspec/changes/agent-codex-split-cli-main-args-dispatch-2026-04-22-13-48/tasks.md @@ -33,6 +33,6 @@ Verification note: `node --test test/cli-args-dispatch.test.js`, `node --test te ## 4. Cleanup -- [ ] 4.1 Run `gx branch finish --branch agent/codex/split-cli-main-args-dispatch-2026-04-22-13-48 --base dev --via-pr --wait-for-merge --cleanup`. +- [ ] 4.1 Run `gx branch finish --branch agent/codex/split-cli-main-args-dispatch-2026-04-22-13-48 --base main --via-pr --wait-for-merge --cleanup`. - [ ] 4.2 Record PR URL and final merge state (`MERGED`) in the completion handoff. - [ ] 4.3 Confirm the sandbox worktree is removed and no local/remote refs remain for the branch.