From 086cd32931c29c68e6e422e131ce7c5069a9bbf6 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Mon, 12 Oct 2026 16:27:07 +0800 Subject: [PATCH 1/2] chore: bump core and the generators for typed configuration values core#87 and its cascade. The CLI matches on no `FrozenUnit::Property`, so this is pins only. One constraint worth recording: `comline-codegen` must be pinned at the *same* generation rev the generator crates pin, not simply at generation's branch tip. Pinning the later conformance commit put two `comline_codegen` revs in the graph and `register(&mut registry)` stopped type-checking against two distinct `Registry` types. Verified end-to-end against a real package built by the pre-bump binary: the `.comline/` store is detected as stale ("found Some(1), need 2"), rebuilt, and restamped to 2 rather than misread. The new checks all fire through the CLI - a bad `@framing` value, `@timeout_ms = "abc"`, and a misspelled settings key are each reported with a suggestion, while an unknown *top-level* settings key still builds, as intended. All five `@framing` spellings core accepts are accepted here too. --- Cargo.lock | 86 +++++++++++++++++++++++++++++++----------------------- Cargo.toml | 8 ++--- 2 files changed, 54 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a4c79e2..20af780 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,15 +177,6 @@ dependencies = [ "backtrace", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -284,6 +275,33 @@ dependencies = [ "stacker", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "4.5.54" @@ -379,7 +397,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=42cc2c037d901acec17e85a1c1ed47690ae4aeb1#42cc2c037d901acec17e85a1c1ed47690ae4aeb1" +source = "git+https://github.com/ComlineProject/generation?rev=6556833d9f6adff1be07f4c51f662492e6343d15#6556833d9f6adff1be07f4c51f662492e6343d15" dependencies = [ "comline-core", "eyre", @@ -388,7 +406,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b#bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b" +source = "git+https://github.com/ComlineProject/comline-rust?rev=e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa#e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa" dependencies = [ "comline-codegen", "comline-core", @@ -398,7 +416,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=f37cc585d93704e147e93909ab80e88c6aeeca4f#f37cc585d93704e147e93909ab80e88c6aeeca4f" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=f9576f28628b05d4af35871344804aa43f5cea98#f9576f28628b05d4af35871344804aa43f5cea98" dependencies = [ "comline-codegen", "comline-core", @@ -408,12 +426,12 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=f03537962746a93e888888905b4224b17d18a6b4#f03537962746a93e888888905b4224b17d18a6b4" +source = "git+https://github.com/ComlineProject/core?rev=6101ef8abaf02f1e3155c8b41d40b17ed41d653c#6101ef8abaf02f1e3155c8b41d40b17ed41d653c" dependencies = [ "ariadne", - "bincode", "blake3", "chumsky", + "ciborium", "comline-core-stdlib", "downcast-rs", "eyre", @@ -422,8 +440,6 @@ dependencies = [ "lz4_flex", "once_cell", "regex", - "rmp", - "rmp-serde", "rust-sitter", "rust-sitter-tool", "semver", @@ -439,7 +455,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=f03537962746a93e888888905b4224b17d18a6b4#f03537962746a93e888888905b4224b17d18a6b4" +source = "git+https://github.com/ComlineProject/core?rev=6101ef8abaf02f1e3155c8b41d40b17ed41d653c#6101ef8abaf02f1e3155c8b41d40b17ed41d653c" [[package]] name = "concolor" @@ -504,6 +520,12 @@ version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + [[package]] name = "crypto-common" version = "0.1.7" @@ -692,6 +714,17 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "half" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +dependencies = [ + "cfg-if", + "crunchy", + "zerocopy", +] + [[package]] name = "handlebars" version = "4.5.0" @@ -1324,25 +1357,6 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" -[[package]] -name = "rmp" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "rmp-serde" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155" -dependencies = [ - "rmp", - "serde", -] - [[package]] name = "roff" version = "1.1.1" diff --git a/Cargo.toml b/Cargo.toml index aacc1ea..9d3720d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ toml = "0.8" # needs real I/O (git fetch, filesystem), so it's off by default for # `comline-core`'s wasm32 consumers (the playground editor, the language # server); the CLI is the one consumer that actually runs `comline build`. -comline-core = { git = "https://github.com/ComlineProject/core", rev = "f03537962746a93e888888905b4224b17d18a6b4", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "6101ef8abaf02f1e3155c8b41d40b17ed41d653c", features = ["deps"] } # All three pinned to revs that agree on one `comline-codegen` - bumped # together: generation#40's branch-tip commit (GenRequest.external_std - # comline-rust/comline-typescript's own codegen crates consume @@ -37,9 +37,9 @@ comline-core = { git = "https://github.com/ComlineProject/core", rev = "f0353796 # they do, since Cargo only unifies a git dependency across byte-identical # revs), then comline-rust#30 and comline-typescript#25 (both branch-tip, # pending those PRs' merge). -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "42cc2c037d901acec17e85a1c1ed47690ae4aeb1" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "f37cc585d93704e147e93909ab80e88c6aeeca4f", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6556833d9f6adff1be07f4c51f662492e6343d15" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "f9576f28628b05d4af35871344804aa43f5cea98", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole From 08563cba8ee66907d990afa38744646be0903a9e Mon Sep 17 00:00:00 2001 From: Kinflou Date: Mon, 12 Oct 2026 16:56:12 +0800 Subject: [PATCH 2/2] chore: align the core pin with the editor-facing additions core#87 grew four more commits while the language-server half of the cascade was written - the registry facts the editor needs (which key pattern segments are placeholders, which keys take a declaration prefix) and a `Display` for settings values. Every consumer in one build graph has to pin the same `comline-core` rev or `Registry`-style types stop matching across crates, so this moves with them. --- Cargo.lock | 10 +++++----- Cargo.toml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 20af780..7380400 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -397,7 +397,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6556833d9f6adff1be07f4c51f662492e6343d15#6556833d9f6adff1be07f4c51f662492e6343d15" +source = "git+https://github.com/ComlineProject/generation?rev=7baf2fb7c67d448093d7dd34b0a41d0c1de2c864#7baf2fb7c67d448093d7dd34b0a41d0c1de2c864" dependencies = [ "comline-core", "eyre", @@ -406,7 +406,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa#e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa" +source = "git+https://github.com/ComlineProject/comline-rust?rev=2b506fc98112ac7f41d8ce6a4d9745bbdc247821#2b506fc98112ac7f41d8ce6a4d9745bbdc247821" dependencies = [ "comline-codegen", "comline-core", @@ -416,7 +416,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=f9576f28628b05d4af35871344804aa43f5cea98#f9576f28628b05d4af35871344804aa43f5cea98" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=26b9c714b9e3df57fc939b7b0627939b407fee37#26b9c714b9e3df57fc939b7b0627939b407fee37" dependencies = [ "comline-codegen", "comline-core", @@ -426,7 +426,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=6101ef8abaf02f1e3155c8b41d40b17ed41d653c#6101ef8abaf02f1e3155c8b41d40b17ed41d653c" +source = "git+https://github.com/ComlineProject/core?rev=021fdfcc3e0de8ac2864a838a630048e21038aa3#021fdfcc3e0de8ac2864a838a630048e21038aa3" dependencies = [ "ariadne", "blake3", @@ -455,7 +455,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=6101ef8abaf02f1e3155c8b41d40b17ed41d653c#6101ef8abaf02f1e3155c8b41d40b17ed41d653c" +source = "git+https://github.com/ComlineProject/core?rev=021fdfcc3e0de8ac2864a838a630048e21038aa3#021fdfcc3e0de8ac2864a838a630048e21038aa3" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index 9d3720d..a88e2e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ toml = "0.8" # needs real I/O (git fetch, filesystem), so it's off by default for # `comline-core`'s wasm32 consumers (the playground editor, the language # server); the CLI is the one consumer that actually runs `comline build`. -comline-core = { git = "https://github.com/ComlineProject/core", rev = "6101ef8abaf02f1e3155c8b41d40b17ed41d653c", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "021fdfcc3e0de8ac2864a838a630048e21038aa3", features = ["deps"] } # All three pinned to revs that agree on one `comline-codegen` - bumped # together: generation#40's branch-tip commit (GenRequest.external_std - # comline-rust/comline-typescript's own codegen crates consume @@ -37,9 +37,9 @@ comline-core = { git = "https://github.com/ComlineProject/core", rev = "6101ef8a # they do, since Cargo only unifies a git dependency across byte-identical # revs), then comline-rust#30 and comline-typescript#25 (both branch-tip, # pending those PRs' merge). -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6556833d9f6adff1be07f4c51f662492e6343d15" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "e8ccbf4cba3ff7def839cdf5f81e2e0a1b9d9daa", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "f9576f28628b05d4af35871344804aa43f5cea98", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "7baf2fb7c67d448093d7dd34b0a41d0c1de2c864" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "2b506fc98112ac7f41d8ce6a4d9745bbdc247821", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "26b9c714b9e3df57fc939b7b0627939b407fee37", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole