From 912d4d1c0aee6eaaef1223247696a10d68696724 Mon Sep 17 00:00:00 2001 From: NagyVikt Date: Thu, 23 Apr 2026 19:01:20 +0200 Subject: [PATCH] Keep merged cleanup evidence truthful Both requested lanes were already merged on main, but their OpenSpec handoffs still showed unchecked cleanup steps and placeholder wording. This updates the stale-session notes and the scorecard tasks file to record the merged PRs, merge SHAs, and branch/worktree cleanup evidence instead of reopening product work. Constraint: The original agent worktrees and branch refs were already pruned, so the only honest fix was main-side bookkeeping Rejected: Recreate the old branches and rerun finish | main already showed PR #392 and PR #393 merged and pruned Confidence: high Scope-risk: narrow Reversibility: clean Directive: When a requested lane is already merged and pruned, backfill the OpenSpec cleanup evidence on a fresh bookkeeping branch instead of reopening product changes Tested: git diff --check; openspec validate --specs; gh pr view 392; gh pr view 393; git worktree list; git branch -a Not-tested: Product/runtime behavior unchanged; no runtime paths exercised --- .../notes.md | 10 ++++++---- .../tasks.md | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/openspec/changes/agent-codex-dismiss-stale-active-session-2026-04-23-18-29/notes.md b/openspec/changes/agent-codex-dismiss-stale-active-session-2026-04-23-18-29/notes.md index 8c42ab0..953d41d 100644 --- a/openspec/changes/agent-codex-dismiss-stale-active-session-2026-04-23-18-29/notes.md +++ b/openspec/changes/agent-codex-dismiss-stale-active-session-2026-04-23-18-29/notes.md @@ -2,7 +2,8 @@ Branch: `agent/codex/dismiss-stale-active-session-2026-04-23-18-29` -Describe the change in a sentence or two. Commit message is the spec of record. +Add a separate `Dismiss` action for stale or dead Active Agents rows so operators can clear leftover active-session records after usage-limit exits or manual takeovers. +Keep the live `Stop` flow process-oriented for real terminals and pids, while verifying the new dismiss path with the focused extension test suite. ## Handoff @@ -12,6 +13,7 @@ Describe the change in a sentence or two. Commit message is the spec of record. ## Cleanup -- [ ] Run: `gx branch finish --branch agent/codex/dismiss-stale-active-session-2026-04-23-18-29 --base main --via-pr --wait-for-merge --cleanup` -- [ ] Record PR URL + `MERGED` state in the completion handoff. -- [ ] Confirm sandbox worktree is gone (`git worktree list`, `git branch -a`). +- Cleanup result: PR [#393](https://github.com/recodeee/gitguardex/pull/393) is `MERGED` with merge commit `fad45e8daed2be67ec8d88b0cebe1ff5040e73f4`; `gh pr view 393`, `git worktree list`, and `git branch -a` on `main` show the lane is closed and pruned. +- [x] Run: `gx branch finish --branch agent/codex/dismiss-stale-active-session-2026-04-23-18-29 --base main --via-pr --wait-for-merge --cleanup` +- [x] Record PR URL + `MERGED` state in the completion handoff. +- [x] Confirm sandbox worktree is gone (`git worktree list`, `git branch -a`). diff --git a/openspec/changes/agent-codex-harden-scorecard-best-practices-2026-04-23-18-42/tasks.md b/openspec/changes/agent-codex-harden-scorecard-best-practices-2026-04-23-18-42/tasks.md index 0d270cd..f87fe1d 100644 --- a/openspec/changes/agent-codex-harden-scorecard-best-practices-2026-04-23-18-42/tasks.md +++ b/openspec/changes/agent-codex-harden-scorecard-best-practices-2026-04-23-18-42/tasks.md @@ -29,6 +29,7 @@ This change is complete only when **all** of the following are true: ## 4. Cleanup (mandatory; run before claiming completion) -- [ ] 4.1 Run the cleanup pipeline: `gx branch finish --branch agent/codex/harden-scorecard-best-practices-2026-04-23-18-42 --base main --via-pr --wait-for-merge --cleanup`. This handles commit -> push -> PR create -> merge wait -> worktree prune in one invocation. -- [ ] 4.2 Record the PR URL and final merge state (`MERGED`) in the completion handoff. -- [ ] 4.3 Confirm the sandbox worktree is gone (`git worktree list` no longer shows the agent path; `git branch -a` shows no surviving local/remote refs for the branch). +- Cleanup result: PR [#392](https://github.com/recodeee/gitguardex/pull/392) is `MERGED` with merge commit `f0ee72a10b676508e21def6bc9a953522d80da22`; `gh pr view 392`, `git worktree list`, and `git branch -a` on `main` show the lane is closed and pruned. +- [x] 4.1 Run the cleanup pipeline: `gx branch finish --branch agent/codex/harden-scorecard-best-practices-2026-04-23-18-42 --base main --via-pr --wait-for-merge --cleanup`. This handles commit -> push -> PR create -> merge wait -> worktree prune in one invocation. +- [x] 4.2 Record the PR URL and final merge state (`MERGED`) in the completion handoff. +- [x] 4.3 Confirm the sandbox worktree is gone (`git worktree list` no longer shows the agent path; `git branch -a` shows no surviving local/remote refs for the branch).