Revert A1 (#5615): restore green main — EqualsClaim discovery-corpus closure-poison

.github/workflows/ci.yml

@@ -66,7 +66,7 @@ jobs:
               echo "::warning::cargo/sccache EAGAIN under fleet pressure; cold retry CARGO_BUILD_JOBS=1 (keep sccache)"
               RETRY_LOG=$(mktemp)
               if ! ( CARGO_BUILD_JOBS=1 cargo build -p v1-compiler --release --features text_lookup_work_counter --bins ) 2>&1 | tee "$RETRY_LOG"; then
-                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache: encountered fatal error' "$RETRY_LOG"; then
+                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache:' "$RETRY_LOG"; then
                   echo "::warning::cargo/sccache still failing; retry without RUSTC_WRAPPER"
                   env -u RUSTC_WRAPPER CARGO_BUILD_JOBS=1 cargo build -p v1-compiler --release --features text_lookup_work_counter --bins || exit 1
                 else
@@ -144,7 +144,7 @@ jobs:
               echo "::warning::cargo/sccache EAGAIN under fleet pressure; cold retry CARGO_BUILD_JOBS=1 (keep sccache)"
               RETRY_LOG=$(mktemp)
               if ! ( CARGO_BUILD_JOBS=1 cargo build -p v1-compiler --release --features text_lookup_work_counter --bins ) 2>&1 | tee "$RETRY_LOG"; then
-                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache: encountered fatal error' "$RETRY_LOG"; then
+                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache:' "$RETRY_LOG"; then
                   echo "::warning::cargo/sccache still failing; retry without RUSTC_WRAPPER"
                   env -u RUSTC_WRAPPER CARGO_BUILD_JOBS=1 cargo build -p v1-compiler --release --features text_lookup_work_counter --bins || exit 1
                 else
@@ -170,7 +170,7 @@ jobs:
               echo "::warning::cargo/sccache EAGAIN under fleet pressure; cold retry CARGO_BUILD_JOBS=1 (keep sccache)"
               RETRY_LOG=$(mktemp)
               if ! ( CARGO_BUILD_JOBS=1 "$ROOT/target/release/gunbc" run --source-root dsl --source-root src/v2 --entry dsl/tools/rust_gates_ci.dag --function main ) 2>&1 | tee "$RETRY_LOG"; then
-                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache: encountered fatal error' "$RETRY_LOG"; then
+                if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache:' "$RETRY_LOG"; then
                   echo "::warning::cargo/sccache still failing; retry without RUSTC_WRAPPER"
                   env -u RUSTC_WRAPPER CARGO_BUILD_JOBS=1 "$ROOT/target/release/gunbc" run --source-root dsl --source-root src/v2 --entry dsl/tools/rust_gates_ci.dag --function main || exit 1
                 else

docs/plans/ci-merge-freshness.md

@@ -61,33 +61,3 @@ re-leak silently excused, a §5 fail-open). It is **complementary** and explicit
 3×-red fix — claiming so would be a false-green about a false-green. The forward completeness checks
 already exist; the reverse-staleness gate is the genuine residual lens; the freshness requirement in §3 is
 the actual 3×-red killer.
-
-## 6. The infra-vs-structural verdict ships DORMANT (scaffold + written enable-gate)
-
-#5615 (`gunbc.ci_failure_class`) builds the construction-first half that makes the §3 freshness
-requirement *viable*: a classifier that partitions a floor red into `Infra | Structural` and a
-fail-closed verdict surface `floor_exit_blocks_merge(ProcessExit) -> Bool` (success / unambiguous-infra ⇒
-non-blocking; everything else, including a bare exit-137, ⇒ Structural ⇒ blocks). Without it, requiring
-green-on-main would block merges on the environmental reds (sccache/EAGAIN/runner contention) that are
-*not* the defect the freshness rule targets.
-
-**#5615 ships this verdict surface DORMANT.** It is built and witnessed but **nothing consumes
-`floor_exit_blocks_merge` to block any merge** — it is dormant by construction, since the freshness
-*mechanism* (§3, the operator merge-queue that would actually re-run vs current `main` and consume the
-verdict) is explicitly out of #5615's scope. This is a §6 **scaffold-with-dissolution-trigger**: the
-verdict exists; flipping it to *enforcing* is the dissolution event, and it is gated — **do not wire the
-merge-queue to block on this verdict until BOTH hold:**
-
-- **(a) the cross-run clustering-reclassification consumer has landed.** A *lone* exit-137 fails closed
-  to `Structural` (a single `ProcessExit` cannot tell a co-residence OOM from a structural
-  memory-runaway). If the green-on-main mechanism went live first, a genuine co-residence OOM on a
-  re-run would read `Structural ⇒ block ⇒ re-run ⇒ OOM ⇒ …` — the livelock deep-otter-528 warned of.
-  The clustering consumer (simultaneous multi-job death + host-uptime reset in a tight window) is what
-  *reclassifies* such a clustered OOM back to `Infra`; it is a **hard prerequisite** for enforcement.
-- **(b) cap-recovery has reclaimed session slots.** Green-on-main re-runs *increase* floor memory load
-  during exactly the contention window this lockdown is containing; enforcing before the host has slack
-  worsens the OOM pressure the verdict is meant to triage.
-
-Until both clear, the verdict is a loaded mechanism left unwired on purpose: a future worker must **not**
-flip it to enforcing early. The trigger is decidable (both consumers either exist on `main` or do not),
-so this is a wall-after-grounding, not a forever-ratchet.

dsl/extdeps/cache/sccache.dag

@@ -36,8 +36,6 @@ data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
 
 data sccache_local_id: CacheInterfaceId = "sccache_local"
 
-data sccache_fatal_error_log_fragment: String = "sccache: encountered fatal error"
-
 data sccache_local_facts: CacheInterfaceCatalogFacts = {
   identity: sccache_local_id
   backing_surface: "sccache-local-disk"

dsl/gunbc/ci_spec.dag

@@ -6,7 +6,6 @@ import gunbc.ci_layer_roots {
 }
 import tools.build_step { BuildArtifact, verifications_script }
 import extdeps.languages.bash.program { Concat, lit, var_ref }
-import gunbc.ci_failure_class { infra_retry_grep_alternation }
 
 type Gate
   = RustMonolithGate
@@ -83,7 +82,7 @@ fn ci_cargo_eagain_retry_core(command: String) -> String {
     concat(
       concat(
         concat(
-          concat(concat("  if grep -qiE '", infra_retry_grep_alternation()), "' \"$BUILD_LOG\"; then\n"),
+          "  if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache: encountered fatal error' \"$BUILD_LOG\"; then\n",
           "    echo \"::warning::cargo/sccache EAGAIN under fleet pressure; cold retry CARGO_BUILD_JOBS=1 (keep sccache)\"\n"
         ),
         concat(
@@ -94,7 +93,7 @@ fn ci_cargo_eagain_retry_core(command: String) -> String {
       concat(
         concat(
           concat(
-            concat(concat("      if grep -qiE '", infra_retry_grep_alternation()), "' \"$RETRY_LOG\"; then\n"),
+            "      if grep -qiE 'Resource temporarily unavailable|failed to spawn|sccache:' \"$RETRY_LOG\"; then\n",
             "        echo \"::warning::cargo/sccache still failing; retry without RUSTC_WRAPPER\"\n"
           ),
           concat("        env -u RUSTC_WRAPPER CARGO_BUILD_JOBS=1 ", concat(command, " || exit 1\n"))