Skip to content

Fix ambiguous count rewrites (stacked on #442) - #462

Merged
afflom merged 1 commit into
release/v0.4from
fix/461-count-writer-ambiguities
Nov 13, 2026
Merged

afflom merged 1 commit into
release/v0.4from
fix/461-count-writer-ambiguities

Conversation

@afflom

@afflom afflom commented Nov 10, 2026

Copy link
Copy Markdown
Member

Closes #461.

Stacked on #442 at 0eff75c. This repairs two decisions in its existing writer; #442 retains ownership of the reporter and fast/report design. Its contributor branch is unchanged.

  • Include unchanged pair explanations before deciding a sum has one destination; reject conflicts and do not emit unchanged rewrites.
  • Require all matching prose-anchor destinations to agree. A known conflict is flagged and cannot use shared-number fallback.
  • Add four focused tests calling the actual pair/prose planners, covering unchanged and moved collisions, agreement, order independence, overlapping contexts and fallback behavior.

Only xtask/src/counts.rs changes. No conformance assertion, seed/bound, generated product, model claim, workflow or compiler change.

Validation: independent source review, git diff --check, exact-base patch checks, and independent reference-model counterexamples/permutations passed. The reference model is not Rust execution. Rust, rustfmt and Clippy are unavailable locally; cargo test --locked -p xtask counts::tests -- --nocapture could not start because cargo is absent. Hosted native tests, formatting and Clippy are pending.

Keep draft: existing draft/stacked CI is development evidence only, not full release qualification. Do not merge this or #442 until required review and final integration qualification are complete.

Refs #461. Preserve the count reporter and default conformance assertions.

@afflom afflom left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Bounded independent source review of exact 810cf9d, stacked on #442 at 0eff75c: no additional source blocker found in the repair of review5828996717.

number_map now includes unchanged pair destinations before deciding uniqueness, so the 30→31 versus 30→30 counterexample is flagged. A uniquely unchanged sum produces no rewrite. prose collects all matching destinations and stops on disagreement before shared-number fallback; agreeing anchors and the unmatched fallback remain usable. The four focused tests call the actual planners and cover these collisions, unchanged sums, overlapping contexts, order reversal and fallback suppression.

Only xtask/src/counts.rs changes. The reporter/fast-mode ownership remains with #442; default conformance assertions, seeds, model claims and products are untouched. This review is static evidence, not Rust execution. Hosted native tests, formatting and Clippy are still required; the draft run’s skipped groups are not full release acceptance. Keep #461 open until reviewed integration and required final qualification. No duplicate patch or local build was started.

afflom commented Nov 10, 2026 •

Copy link
Copy Markdown
Member Author

The existing draft run now supplies the missing native development evidence for exact head 810cf9df; no local test or gate was repeated.

  • Rest job129632644466 explicitly reports all four new pair/prose planner tests ok, all eight counts::tests passing, and the xtask library result of 20 passed with no failures/ignored/filtered tests. The same log shows workspace/all-target/all-feature Clippy with warnings denied completing successfully under pinned Rust1.97.1.
  • Honesty job129631717632 explicitly runs cargo fmt --all -- --check, then advances to model validation in the fail-closed command chain; the job and gate step passed. Formatting was not present in the rest log, so it was verified from this owning job instead.

This closes the native planner/formatting/Clippy evidence gap in the earlier source review5836936933. It does not make the old draft run a full gate: seven groups were skipped. The live PR became ready at05:38:47 and initiated CI run42763429738 on the same head. Its current inventory still skips seven groups because this PR targets the #442 feature branch; marking it ready does not turn the stacked run into full release qualification. The run and final stack/integration acceptance remain pending with the existing owner. #461/#442 stay open.

@afflom
afflom changed the base branch from bs-count-writer to release/v0.4 November 13, 2026 19:38
@afflom
afflom merged commit 6a02d2c into release/v0.4 Nov 13, 2026
21 checks passed
@afflom
afflom deleted the fix/461-count-writer-ambiguities branch November 13, 2026 19:38
afflom pushed a commit that referenced this pull request Nov 13, 2026
Neither moves the language-1.2 identity (no change under language/,
schemas/ or the embedded golden fixtures), so c3eb8d5's products apply.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Asa3MWG2BeFisFkR1Kebg
humuhumu33 added a commit that referenced this pull request Nov 13, 2026
…unt rewrites) into the arrays branch

Only CHANGELOG.md conflicted: the arrays entry stays first, #517's entry
follows. No language data, schema, or fixture changed upstream, so the
language-1.2 identity and the regenerated files of 60cdeb0 stand; the
register is still 497.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@afflom afflom left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Postlanding final acceptance is complete for actual merge6a02d2c7d519f1a4d169ebb3496fbad51bd259cb, tree d3dd48a52f369afd7627df01e51ebeaef10eeaeb. Its existing push CI43494150955 attempt1 passed all70 dynamically materialized jobs and772 steps, including same-run honesty; exact actual-commit repro43494150940 passed all7 steps. No canceled or earlier-tree jobs contribute to this acceptance.

Independent whole-issue #461 audit confirms the actual net change is only counts.rs and is byte-identical to reviewed810cf. Existing native tests cover unchanged/moved pair collisions, agreement/unchanged sums, overlapping prose anchors, order independence and fallback suppression. Formatting/Clippy and current full qualification passed; seeds, products, model claims and #442 ownership/design remain preserved.

The accepted/tested commit here is the actual merge itself, with ordered parents be7+810cf. No final premerge acceptance review was found for the external landing; this is explicitly postlanding acceptance. Receipt issue461-final-acceptance-20261114/receipt.json supports closing the narrow #461 scope with this merged link. No test, log, producer or completed gate was repeated.

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