diff --git a/.run_status.toml b/.run_status.toml index 1ec91f7..caa89c7 100644 --- a/.run_status.toml +++ b/.run_status.toml @@ -5,7 +5,7 @@ coverage = 92.34 [last_run_clean.run_duration] secs = 29 -nanos = 404930147 +nanos = 803755166 [last_run_incremental] run_status = "Success" diff --git a/AGENTS.md b/AGENTS.md index fea99f2..2ad491a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -256,5 +256,9 @@ combining it with later work. After every milestone's acceptance criteria and quality gates pass, create an annotated Git tag named `v0.1.N`, where `N` is the milestone number, on its -completion commit. Never move an existing milestone tag; add a corrective -commit and a documented successor tag if a published milestone needs amendment. +completion commit. Before that completion commit, set the workspace package +version and internal registry dependency requirements to `0.1.N`, refresh +`Cargo.lock`, cut the matching changelog entry, and regenerate the version badge. +Verify those artifacts and binary `--version` output agree before tagging. Never +move an existing milestone tag; add a corrective commit and a documented +successor tag if a published milestone needs amendment. diff --git a/CHANGELOG.md b/CHANGELOG.md index eea9529..d324d59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,13 @@ All notable changes to John Slop are recorded here. The format follows ## [Unreleased] +## [0.1.20] - 2026-09-29 + ### Changed +- Synchronized workspace package versions, internal dependency requirements, + lockfile metadata, binary version output, milestone tags, and the generated + version badge, with a regression contract to prevent future drift. - Made graphical Miette output easier to scan with marked rule-code titles, attached diagnostic bodies, and spacing between complete findings. - Expanded the expected-failure diagnostic showcase to include prose and source @@ -41,5 +46,6 @@ All notable changes to John Slop are recorded here. The format follows - Stdio LSP replacement diagnostics and versioned quick fixes. - Runnable examples, reviewed fixtures, fuzz targets, benchmarks, and CI gates. -[Unreleased]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.0...HEAD +[Unreleased]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.20...HEAD +[0.1.20]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.0...v0.1.20 [0.1.0]: https://git.dandaedre.com/idle-org/john_slop/releases/tag/v0.1.0 diff --git a/Cargo.lock b/Cargo.lock index a6a079f..388b99d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,7 +699,7 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "john-slop-core" -version = "0.1.0" +version = "0.1.20" dependencies = [ "directories", "figment", @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "john-slop-lsp" -version = "0.1.0" +version = "0.1.20" dependencies = [ "john-slop-core", "serde_json", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "john_slop" -version = "0.1.0" +version = "0.1.20" dependencies = [ "clap", "criterion", diff --git a/Cargo.toml b/Cargo.toml index e51ba94..53fd05f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = [".", "crates/john-slop-core", "crates/john-slop-lsp"] resolver = "3" [workspace.package] -version = "0.1.0" +version = "0.1.20" edition = "2024" rust-version = "1.98.1" license = "MIT" @@ -18,8 +18,8 @@ figment = { version = "0.10.19", default-features = false, features = ["toml"] } futures = { version = "0.3.34", default-features = false, features = ["std"] } globset = { version = "0.4.20", default-features = false } insta = { version = "1.48.0", default-features = false } -john-slop-core = { version = "0.1.0", path = "crates/john-slop-core" } -john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.0", path = "crates/john-slop-lsp" } +john-slop-core = { version = "0.1.20", path = "crates/john-slop-core" } +john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.20", path = "crates/john-slop-lsp" } miette = { version = "7.6.0", default-features = false, features = ["derive"] } regex = "1.13.1" serde = { version = "1.0.229", features = ["derive"] } diff --git a/badges/version.svg b/badges/version.svg index 3384e6c..3583d1f 100644 --- a/badges/version.svg +++ b/badges/version.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/docs/development.md b/docs/development.md index 2bd3c7c..47e04df 100644 --- a/docs/development.md +++ b/docs/development.md @@ -93,7 +93,9 @@ task-level commit discipline are in [AGENTS.md](../AGENTS.md). Each completed milestone receives an immutable annotated `v0.1.N` Git tag, where `N` is the milestone number, after its acceptance criteria and quality -gates pass. +gates pass. Its completion commit must also use package version `0.1.N` in the +workspace manifest, internal registry requirements, lockfile, changelog, binary +version output, and generated version badge. ## Fuzzing diff --git a/docs/evaluation.md b/docs/evaluation.md index 10a1feb..651c7cf 100644 --- a/docs/evaluation.md +++ b/docs/evaluation.md @@ -44,11 +44,12 @@ are required before tuning default weights or thresholds. ## Default-policy sign-off Each shipped rule has at least one explicitly labeled realistic near miss. The -0.1.0 review keeps all schema-version 1 rules, weights, and thresholds unchanged. -The renewed review accepts lighter `0.90ⁿ` correlation damping for distinct -prompt-leakage rules while retaining `0.75ⁿ` for other categories. The checked-in -`signoff.toml` records that decision, acknowledges the corpus limitations, and -contains the unchanged SHA-256 digest of +initial 0.1.0 review kept all schema-version 1 rules, weights, and thresholds +unchanged. The renewed review, carried forward by the unchanged catalog hash to +0.1.20, accepts lighter `0.90ⁿ` correlation damping for distinct prompt-leakage +rules while retaining `0.75ⁿ` for other categories. The checked-in `signoff.toml` +records that decision, acknowledges the corpus limitations, and contains the +unchanged SHA-256 digest of `crates/john-slop-core/assets/heuristics.toml`. Any default rule, matcher, pattern, weight, occurrence cap, scope, or threshold diff --git a/docs/releasing.md b/docs/releasing.md index 82732aa..67c8e0f 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -12,7 +12,9 @@ matching core and LSP versions exist in the registry; after publication, rerun the script without it to verify the registry-form dependency graph. 1. Ensure `CHANGELOG.md`, `Cargo.toml`, `Cargo.lock`, documentation, and the - version badge agree; run every command in `docs/development.md`. + version badge agree; run every command in `docs/development.md`. Milestone + `v0.1.N` completion commits use package version `0.1.N`; regenerate the badge + only after updating the manifest and lockfile. 2. Run normal Criterion sampling and the fuzz targets appropriate to changes. 3. Commit the release preparation and create signed or annotated tag `vX.Y.Z`. 4. Check out that tag and install the pinned SBOM tool: diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 43ae0c9..3b25873 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -383,6 +383,21 @@ dependencies = [ "libc", ] +[[package]] +name = "john-slop-core" +version = "0.1.20" +dependencies = [ + "directories", + "figment", + "globset", + "miette", + "regex", + "serde", + "thiserror", + "walkdir", + "zip", +] + [[package]] name = "john-slop-fuzz" version = "0.0.0" @@ -393,16 +408,26 @@ dependencies = [ "toml 1.1.6+spec-1.1.0", ] +[[package]] +name = "john-slop-lsp" +version = "0.1.20" +dependencies = [ + "john-slop-core", + "serde_json", + "thiserror", + "tokio", + "tower-lsp-server", +] + [[package]] name = "john_slop" -version = "0.1.0" +version = "0.1.20" dependencies = [ "clap", - "directories", - "figment", "globset", + "john-slop-core", + "john-slop-lsp", "miette", - "regex", "serde", "serde_json", "similar", @@ -411,8 +436,6 @@ dependencies = [ "tokio", "toml 1.1.6+spec-1.1.0", "tower-lsp-server", - "walkdir", - "zip", ] [[package]] diff --git a/tasks.md b/tasks.md index f62fd35..c2ea930 100644 --- a/tasks.md +++ b/tasks.md @@ -493,7 +493,7 @@ and Tarpaulin passed; coverage is 92.34% (1,411/1,528 lines). ## Milestone 20 — Milestone and package version synchronization -- [ ] Correct the version drift forward without moving immutable tags: bump the +- [x] Correct the version drift forward without moving immutable tags: bump the workspace packages and internal registry requirements to `0.1.20`, refresh the lockfile and generated version badge, cut the accumulated changelog entry, and make the workspace contract verify that Cargo metadata, internal dependency @@ -507,6 +507,14 @@ new `v0.1.20` tag agree; the existing `v0.1.19` and earlier tags remain untouched; workspace package assembly, both feature matrices, documentation, and the coverage floor pass. +Accepted on 2026-09-29 after all three packages, internal registry dependency +requirements, root and fuzz lockfiles, reviewed evaluation sign-off, three +binary version strings, changelog, and generated badge were synchronized at +`0.1.20`. The workspace contract now rejects metadata, dependency, lockfile, or +badge drift. Formatting, Clippy, rustdoc, both feature matrices, pre-publication +package assembly, and Tarpaulin passed; coverage remains 92.34% +(1,411/1,528 lines). + ## Deferred by design - Statistical or model-based authorship classification. diff --git a/tests/fixtures/evaluation/signoff.toml b/tests/fixtures/evaluation/signoff.toml index 3a8cbca..e4b7e51 100644 --- a/tests/fixtures/evaluation/signoff.toml +++ b/tests/fixtures/evaluation/signoff.toml @@ -1,5 +1,5 @@ schema_version = 1 -release = "0.1.0" +release = "0.1.20" reviewed_on = "2026-09-29" status = "accepted-after-prompt-damping-review" catalog_sha256 = "8617e56c1f874307fd967ef688c37d42efa750bfb833eb364b797dc588ce1fb0" diff --git a/tests/workspace_contract.rs b/tests/workspace_contract.rs index 3f99050..5a9234a 100644 --- a/tests/workspace_contract.rs +++ b/tests/workspace_contract.rs @@ -42,6 +42,9 @@ fn workspace_members_and_resolved_versions_are_synchronized() { let workspace = root["workspace"] .as_table() .expect("workspace must be a table"); + let workspace_version = workspace["package"]["version"] + .as_str() + .expect("workspace.package.version must be a string"); assert_eq!( string_array(&workspace["members"], "workspace.members"), ["crates/john-slop-core", "crates/john-slop-lsp"] @@ -66,7 +69,46 @@ fn workspace_members_and_resolved_versions_are_synchronized() { .as_array() .expect("metadata packages must be an array"); assert_eq!(packages.len(), 3); - assert!(packages.iter().all(|package| package["version"] == "0.1.0")); + assert!( + packages + .iter() + .all(|package| package["version"] == workspace_version), + "all workspace packages must resolve to {workspace_version}" + ); + + for dependency in ["john-slop-core", "john-slop-lsp-engine"] { + assert_eq!( + workspace["dependencies"][dependency]["version"].as_str(), + Some(workspace_version), + "workspace.dependencies.{dependency} must match the workspace version" + ); + } + + let lockfile = manifest("Cargo.lock"); + let locked_packages = lockfile["package"] + .as_array() + .expect("Cargo.lock package must be an array"); + for package_name in ["john_slop", "john-slop-core", "john-slop-lsp"] { + let package = locked_packages + .iter() + .find(|package| package["name"].as_str() == Some(package_name)) + .unwrap_or_else(|| panic!("Cargo.lock must contain {package_name}")); + assert_eq!( + package["version"].as_str(), + Some(workspace_version), + "Cargo.lock {package_name} version must match the workspace version" + ); + } + + let badge = fs::read_to_string("badges/version.svg").expect("version badge must be readable"); + assert!( + badge.contains(&format!("aria-label=\"version: {workspace_version}\"")), + "version badge must advertise workspace version {workspace_version}" + ); + assert!( + badge.contains(&format!("