Skip to content

fix(git-tidy): preserve integrated work recommendations - #301

Merged
jongio merged 1 commit into
mainfrom
jongio-crispy-potato
Nov 18, 2026
Merged

jongio merged 1 commit into
mainfrom
jongio-crispy-potato

Conversation

@jongio

@jongio jongio commented Nov 18, 2026

Copy link
Copy Markdown
Owner

Summary

Follow-up to #299, addressing its two post-merge Copilot findings.

  • Report integrated-work-retained when complete integration proof leaves an empty work item retained by safeguards, rather than claiming evidence is incomplete.
  • Preserve the normal complete group's resume recommendation and monotone keep-save review transition when a grouped stash still has unique change units.
  • Keep whole-group-empty squash deferral, reverted-integration behavior, carrier actions/eligibility, last-copy safeguards, blockers, protection, scope, and approval gates unchanged.

Only the policy, focused integration tests, and evidence-model reference change. No cleanup actions or skill installation are included.

Validation

  • node --test --test-concurrency=1 --experimental-test-coverage --test-coverage-include="**/triage-policy.mjs" --test-name-pattern="squash|proven protected integrated work|integrated branch preserves resume|stash components|exact duplicate stash|every recommendation transition|applyReview rejects the whole batch" skills\git-tidy\test\triage.integration.test.mjs skills\git-tidy\test\classify.test.mjs: 8 passed, 0 failed.
  • node --test --test-concurrency=1 --experimental-test-coverage --test-coverage-lines=80 --test-coverage-functions=80 --test-coverage-branches=80 skills\git-tidy\test\*.test.mjs: 286 passed, 0 failed, no skips. Overall coverage: 95.54% lines, 89.95% branches, 98.11% functions. Touched policy: 98.17% lines, 95.72% branches, 100% functions.
  • Locked local Vally lint skills\git-tidy and lint --eval-spec skills\git-tidy\evals\git-tidy\eval.yaml --strict: passed. No model-backed evals run.
  • npm run build --prefix site: passed, including catalog performance bounds.
  • node --check on the changed JavaScript and git diff --check: passed.
  • Scoped code review, documentation/link checks, and light security review: no material findings. CLI/API entry points use the same policy; schemas and mutation/approval paths are unchanged.
  • Local verification gap: node --test --test-concurrency=1 test\*.test.mjs finished with 79 passed, 1 skipped, 1 failed. The unchanged nested PR-statusline native Windows attention-helper test returned {"type":"unavailable","message":"Access is denied"} at extensions\pr-statusline\test\attention.test.mjs:1050. No helper, host-permission, or unrelated code changes were made. Hosted CI must pass before merge readiness.

Related issues and delivery boundaries

No related issues were identified in the handoff or the original PR's closing links; #299 is a pull request, not an issue.

Merge requires a separate final decision on the reviewed full head. Repository auto-deletion of merged head branches conflicts with the current no-cleanup restriction and must be explicitly resolved before any merge. No GitHub auto-merge or Agent merge is enabled by this work.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No active review issues were identified in the integrated-work classification changes.

No open issues 🎉

What changed in this PR

Refines git-tidy’s integrated-work classification following #299, preserving useful recommendations without changing cleanup safeguards, eligibility, or approval requirements.

Changes:

  • Reports integrated-work-retained instead of incomplete evidence when proven integrated work has no remaining change units but must be retained.
  • Preserves resume and the allowed keep-save review transition when a complete group still contains stash change units.
  • Adds focused regression coverage and documents the group-wide recommendation behavior.
File Description
skills/​git-tidy/​test/​triage.integration.test.mjs Covers retained integration reasons and grouped-stash resume/save behavior.
skills/​git-tidy/​scripts/​lib/​triage-policy.mjs Adjusts integrated-group recommendations and retention reasons.
skills/​git-tidy/​references/​evidence-model.md Documents whole-group change-unit checks and unchanged cleanup safeguards.

Review effort: Balanced

@jongio
jongio merged commit ccacf8c into main Nov 18, 2026
10 checks passed
@jongio
jongio deleted the jongio-crispy-potato branch November 18, 2026 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants