Skip to content

fix(stella-pipeline,make): unbreak main — witness-stage merge clobber and a duplicate Makefile target - #1904

Merged
macanderson merged 1 commit into
mainfrom
fix/unbreak-main-post-flurry-merge
Aug 6, 2026
Merged

fix(stella-pipeline,make): unbreak main — witness-stage merge clobber and a duplicate Makefile target#1904
macanderson merged 1 commit into
mainfrom
fix/unbreak-main-post-flurry-merge

Conversation

@macanderson

@macanderson macanderson commented Aug 6, 2026

Copy link
Copy Markdown
Owner

Problem

Local make gate on main (11c4ca1e) after the ~20-PR merge flurry (merged untested during the GitHub Actions outage, #1899) found stella-pipeline does not compile: the Spend-struct refactor and #1789's degradable budget-abort arms merged textually clean but semantically never met — both Aborted arms in witness_stage.rs still referenced the pre-refactor total/budget bindings (E0425 ×4). This one break cascades: lint, test, doc-warnings, and the wire-schema serve-frame exporter all go red behind it.

Separately, PR #1844 and its stacked PR #1881 each added the identical guard-sigpipe-test Makefile target, so every make invocation warns about the override.

Fix

  • Align the two Aborted arms with their sibling Completed arms: *spend.total += cost_usd and budget_abort(spend.budget.evaluate()). Restores exactly the intent both parent PRs tested independently.
  • Delete the duplicate Makefile target block (kept the first).

Verification (local — Actions is in a major outage, stated per policy)

  • cargo check -p stella-pipeline -j 2: clean (main: E0425 ×4).
  • cargo test -p stella-pipeline -j 2 witness: 123 passed, 0 failed — the entire witness-stage suite, which cannot even compile on main, is the witness here; a new test would be dishonest (no new behavior, only the restoration of two intents that were each already tested).
  • cargo clippy -p stella-pipeline --all-targets -- -D warnings: clean.
  • make no longer emits the override warning.

Remaining main breaks (sibling PRs, from the same gate run)

  • toolset.rs new god file (1756 > 1500) + the MAX_SERVER_SCHEMA_BYTES → private crate::client::ingest rustdoc link — in the toolset split PR.

Refs #1899.

Summary by Sourcery

Fix witness-stage budget handling after a spend-struct refactor and clean up a duplicate Makefile target.

Bug Fixes:

  • Correct witness-stage aborted-turn accounting to update the spend tracker and evaluate the budget from the spend structure, restoring compilation and intended budget behavior.

Build:

  • Remove a duplicated guard-sigpipe-test Makefile target to eliminate override warnings on make runs.

… and a duplicate Makefile target

Two of the ~20 PRs merged untested during the GitHub Actions outage
collided semantically:

- witness_stage.rs: the Spend-struct refactor and #1789's degradable
  budget-abort arms merged textually clean but never met — both Aborted
  arms still referenced the pre-refactor `total`/`budget` bindings
  (E0425 x4), so stella-pipeline stopped compiling, taking lint, test,
  doc-warnings and the wire-schema exporter down with it. Align the
  arms with their sibling Completed arms: `*spend.total` /
  `spend.budget.evaluate()`.

- Makefile: PR #1844 and stacked PR #1881 each added the identical
  guard-sigpipe-test target, and make warns about the override on
  every invocation. Keep one.

The witness for the pipeline half is the whole existing witness-stage
test suite, which cannot even compile on main today; no new test is
honest here (this restores intent both parents already tested).
Remaining main breaks are fixed in sibling PRs: the toolset.rs god-file
split + mcp rustdoc link (split PR), tracked from the gate run log.

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry @macanderson, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

@vercel

vercel Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
Project Deployment Actions Updated (UTC)
stella-cli-docs Ignored Ignored Aug 6, 2026 7:19pm

@sourcery-ai

sourcery-ai Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Fixes compilation in stella-pipeline’s witness_stage by wiring aborted-turn accounting to the new Spend struct fields, and removes a duplicated Makefile target that was causing override warnings.

File-Level Changes

Change Details Files
Align witness-stage aborted-turn handling with the Spend struct refactor.
  • Update both Aborted arms to accumulate cost into spend.total instead of a now-removed total binding.
  • Use spend.budget.evaluate() when calling budget_abort so degraded budget aborts are evaluated against the Spend’s budget state.
  • Keep behavior consistent with the neighboring Completed arms and prior intent from the Spend refactor and degradable budget-abort work.
crates/stella-pipeline/src/pipeline/witness_stage.rs
Remove duplicate Makefile target that caused redefinition warnings.
  • Delete the second guard-sigpipe-test .PHONY and target block, keeping the original definition.
  • Eliminate make override warnings while preserving the existing guard-sigpipe test behavior.
Makefile

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@macanderson
macanderson merged commit 9f9bd71 into main Aug 6, 2026
4 checks passed
@macanderson
macanderson deleted the fix/unbreak-main-post-flurry-merge branch August 6, 2026 19:34
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.

1 participant