Skip to content

chore: bundle PMAT-702..705 distill cascade (subsumes #1874, #1877, #1879, #1881)#1897

Closed
noahgift wants to merge 7 commits into
mainfrom
chore/bundle-pmat-7xx-cascade
Closed

chore: bundle PMAT-702..705 distill cascade (subsumes #1874, #1877, #1879, #1881)#1897
noahgift wants to merge 7 commits into
mainfrom
chore/bundle-pmat-7xx-cascade

Conversation

@noahgift

Copy link
Copy Markdown
Contributor

Summary

Bundles 4 distill cascade PRs into one squash-merge per the v0.35.x hiatus-prep release strategy. Saves 4 CI runs.

Subsumes (closes)

NOT bundled (deferred)

Conflict resolution

#1879#1877 conflicted in crates/apr-cli/src/commands/distill.rs. Resolution: accepted #1879's pre-integrated version verbatim — it already handles BOTH backend selection (PMAT-704 env var) AND vocab alignment (via TruncatingTeacher wrapper from PMAT-703).

Pre-push gates (local)

  • cargo fmt --all -- --check — 0 diffs
  • cargo test -p aprender-contracts --lib lint:: — 191 passed, 0 failed

Methodology note

Per memory/feedback_chain_pr_squash_leapfrog, bundling chained-style PRs is risky. Mitigation: each bundled PR is small (~50-300 LOC), the cascade is conceptually one unit (PMAT-7xx distill fixes), and we're cutting at v0.35.x hiatus boundary where independent bisectability is less valuable than fast convergence to a clean main.

🤖 Generated with Claude Code

noahgift added 4 commits May 23, 2026 06:30
…vert PMAT-704 Bug B (#1879)

Conflict resolution: #1879's integrated version of distill.rs handles BOTH
PMAT-703 vocab alignment (via TruncatingTeacher wrapper) AND PMAT-704
backend selection (APR_DISTILL_TEACHER_BACKEND env var). Accepted as-is.
noahgift added 3 commits May 23, 2026 07:34
…line.rs)

clippy::needless-update fires at 5 sites in pipeline.rs where every
CallbackContext field is explicitly listed before ..Default::default().
Removed the trailing struct-update everywhere. Trailing comma on the
last field is intentional (rustfmt-friendly) but the .. clause was
silencing future field additions.

Closes the ci/lint failure on PR #1897 (bundle PMAT-702..705 cascade).
@noahgift

Copy link
Copy Markdown
Contributor Author

Subsumed by #1898 (mega-bundle hiatus close-out). Squash-merge preserves the per-PR commit message — see #1898 commit log.

@noahgift noahgift closed this May 23, 2026
auto-merge was automatically disabled May 23, 2026 07:09

Pull request was closed

noahgift added a commit that referenced this pull request May 23, 2026
, #1896, #1897) (#1898)

* docs(spec): SPEC-DISTILL-001 §87 — PMAT-704 post-mortem on Bug B wrong turn (#1880)

* chore(distill): Stage D dispatch wrapper with PMAT-701 lessons baked in (#1883)

* chore(distill): Phase 5 HumanEval dispatch wrapper (#1886)

* chore: bundle PMAT-702..705 distill cascade + clippy fix (#1897)

* fix(cli): point 7B qwen models to single-file GGUF artifacts and align caches (#1891)

* fix(chat): preserve original path in FileNotFound for filesystem paths

PR #1891 wrapped all path_arg through HF alias resolution. For inputs
that look like filesystem paths (absolute or starts with ./, ../) and
don't exist, the alias resolver was rewriting them as hf:// URIs and
returning a mangled path in the FileNotFound error.

Fix: short-circuit with the original path_arg in the error BEFORE alias
resolution kicks in. Preserves the contract that test_run_file_not_found
and test_run_nonexistent_path_without_trace assert.

Closes the workspace-test failure on bundle PR #1898.
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