Skip to content

fix(tri): restore the seven definitions a batch merge dropped - #2228

Merged
gHashTag merged 2 commits into
masterfrom
fix/tri-build-restore
Aug 19, 2026
Merged

fix(tri): restore the seven definitions a batch merge dropped#2228
gHashTag merged 2 commits into
masterfrom
fix/tri-build-restore

Conversation

@gHashTag

Copy link
Copy Markdown
Owner

Restores master's cargo build -p tri. Definitions recovered verbatim from Wave Loops 437/441/443/453; bit_config's half-finished status()/output() refactor completed. Master's own build check was green from a pre-break commit — every PR failed on it (found by the #2223 gate). Closes #2227

🤖 Generated with Claude Code

gHashTag and others added 2 commits August 19, 2026 20:35
…_config's output refactor

A wave-loop batch merge kept the call sites and lost the definitions:
SmokeGateReport, pvt_context_inside_envelope, synthetic_pvt_context,
cclk_period_ns, verify_lean, extract_source_from_lean. Restored verbatim
from the commits that introduced them (Wave Loops 437/441/443/453).
bit_config now actually captures output (status() cannot), passes stderr
through, and the console arm prints the string it now returns.
Disclosure: rustfmt over fpga.rs also canonicalised eleven pre-existing
unformatted spots left by the same merges; no semantic change in them.

Closes #2227

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown
Contributor

📓 NotebookLM Notebook linked to this PR

This notebook contains session context, decisions, and artifacts for this work.

@github-actions

Copy link
Copy Markdown
Contributor

PR Dashboard

Generated at: 2026-08-19 13:41:30 UTC

Summary

Status Count
Total Open PRs 29
PRs with Failing Checks 13
PRs with All Checks Green 16
READY 9
FAILING 13
PENDING 0

Seal Status

  • ⚠️ STALE -- sha256(compiler.rs)=54d19991b0c2 != manifest seal=87e5cbd3ad94.
    The committed NMSE numbers were certified against an older compiler.rs.
    Run scripts/reseal-check.sh locally for the two-step reseal command (advisory; not a merge gate).

@gHashTag
gHashTag merged commit 67d98dd into master Aug 19, 2026
30 of 32 checks passed
@gHashTag
gHashTag deleted the fix/tri-build-restore branch August 19, 2026 14:10
gHashTag added a commit that referenced this pull request Aug 20, 2026
… reads (#2305)

`dry_run_sweep_ok` had two mentions in cli/tri/src/fpga.rs: declared `false`
at 6098, read in the `passed` conjunction at 6333, never assigned `true`. The
dry-run CCLK sweep succeeds and prints its OK line, but nothing recorded it,
so smoke_gate() returned passed=false for every possible input.

Its siblings survive this by being read guarded -- (!run_verify_lean ||
verify_lean_ok) is vacuously true when the phase is not requested. The
`&& dry_run_sweep_ok` term is unguarded, so it failed the gate unconditionally.

This is the second occurrence of the shape documented at line 6167 for
verify_lean_ok, restored from 494e659 after the #2228 batch merge dropped it.
dry_run_sweep_ok went out in the same merge and was missed. The fix mirrors the
restored code: at the point where success is established -- after the
variant-count bail, before the OK line -- set the flag and write the report
entry, in that order.

The report entry is part of the fix, not extra scope: report["dry_run_sweep"]
was written only on failure, so on success it kept the null from its
initializer, and the test requires that key to be an object with status "ok".

Not compiled: the authoring machine had ~148 MB free, too little to check out
the repo or run cargo. Verified textually -- three mentions instead of two,
placement mirrors verify_lean_ok, dry_report/variant_count in scope, and
dry_run_sweep is an existing field on the deny_unknown_fields report schema.

The verdict conjunction is unchanged; no phase was dropped to make it pass.

Closes #2304
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.

master: cargo build -p tri broken — seven definitions lost in a wave-loop batch merge

1 participant