fix(robot): conflict-first + carry-forward classify + test-order pollution eliminated #237

Merged
conductor merged 2 commits from research-structuralization into master 2026-09-08 05:59:47 +01:00
Owner

Three fixes (Nick directive)

  1. Conflict-first: mergeable=False triggers the API update IMMEDIATELY (before any wait cycle) — merges resolve in ~1min, then sleep. 409 conflicts skip with the reason named.
  2. Carry-forward race closed: BOTH update paths (conflict-first + behind-base) classify the tree diff — docs-only carries the prior green, any code-path touch requires fresh CI. Closes the #208 slip (merged on stale required-checks).
  3. Test-order pollution eliminated: shard_manager imported via package path (single module object); p1_03 fixture isolates SHARD_DIR; _no_shards patches route_query. 62 order-dependent failures → 0.

Suite 1007+84 green.

## Three fixes (Nick directive) 1. **Conflict-first**: mergeable=False triggers the API update IMMEDIATELY (before any wait cycle) — merges resolve in ~1min, then sleep. 409 conflicts skip with the reason named. 2. **Carry-forward race closed**: BOTH update paths (conflict-first + behind-base) classify the tree diff — docs-only carries the prior green, any code-path touch requires fresh CI. Closes the #208 slip (merged on stale required-checks). 3. **Test-order pollution eliminated**: shard_manager imported via package path (single module object); p1_03 fixture isolates SHARD_DIR; _no_shards patches route_query. 62 order-dependent failures → 0. Suite 1007+84 green.
conductor added 2 commits 2026-09-08 05:58:43 +01:00
feat(robot): conflict-first policy — staleness resolved immediately on mergeable=False (before any wait), 409 conflicts skip with reason; carry-forward race closed by re-verifying mergeable post-update (Nick policy: merges resolve in ~1min, then sleep)
CI Pipeline / best-practices (push) Successful in 4s
CI Pipeline / documentation (push) Successful in 2s
CI Pipeline / canary (push) Successful in 29s
CI Pipeline / lint (push) Successful in 33s
CI Pipeline / type-check (push) Successful in 25s
CI Pipeline / gitea-offline (push) Successful in 13s
CI Pipeline / unit-tests (push) Successful in 50s
CI Pipeline / required-checks (push) Successful in 1s
61f1ca63e8
fix(robot): classify gate on BOTH update paths (conflict-first + behind-base) — code-path touch always waits for fresh CI; docs-only carries. Closes the #208 slip (merge on stale required-checks)
CI Pipeline / canary (push) Successful in 30s
CI Pipeline / best-practices (push) Successful in 3s
CI Pipeline / documentation (push) Successful in 3s
CI Pipeline / gitea-offline (push) Successful in 14s
CI Pipeline / unit-tests (push) Successful in 54s
CI Pipeline / lint (push) Successful in 30s
CI Pipeline / type-check (push) Successful in 24s
CI Pipeline / required-checks (push) Successful in 1s
Auto-label / priority-gate (pull_request) Skipped
CI Pipeline / best-practices (pull_request) Successful in 3s
Auto-label / auto-label (pull_request) Successful in 3s
CI Pipeline / documentation (pull_request) Successful in 2s
CI Pipeline / canary (pull_request) Successful in 26s
CI Pipeline / lint (pull_request) Successful in 30s
CI Pipeline / type-check (pull_request) Successful in 26s
Spec gate (headless) / spec-gate (pull_request) Successful in 6s
CI Pipeline / gitea-offline (pull_request) Successful in 13s
CI Pipeline / unit-tests (pull_request) Successful in 47s
CI Pipeline / required-checks (pull_request) Successful in 1s
Auto-version and Release / release (pull_request) Failing after 10s
ab2c567ea4
gitea-actions Bot added the bugperception labels 2026-09-08 05:58:53 +01:00

🤖 Headless spec gate (non-blocking, #204 first slice)

Spec-gate agent produced no text output — check runner logs.

Deterministic floors still govern the merge

This comment is advisory. Required checks (lint, tests, canaries, type-check, coverage, dependency lock, impact gate) remain the merge authority per docs/adversarial-review.md proportionality.

🤖 **Headless spec gate (non-blocking, #204 first slice)** Spec-gate agent produced no text output — check runner logs. <details><summary>Deterministic floors still govern the merge</summary> This comment is advisory. Required checks (lint, tests, canaries, type-check, coverage, dependency lock, impact gate) remain the merge authority per docs/adversarial-review.md proportionality.</details>
conductor merged commit 5de0145683 into master 2026-09-08 05:59:47 +01:00
Sign in to join this conversation.
No Reviewers
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: conductor/rune#237