From 269d2d3f64abc74ace2277f598f7c232c42ec961 Mon Sep 17 00:00:00 2001 From: kleinbem Date: Wed, 18 Nov 2026 14:51:44 +0000 Subject: [PATCH] chore(evidence-plugin): take mesh-llm-plugin from the mesh-llm v0.80.0 release The pinned commit predates Mesh-LLM/mesh-llm#2448, so its build script always runs the bundled protoc, even when PROTOC is set. v0.80.0 has that change and still carries announce_plugin_key (Mesh-LLM/mesh-llm#2299); crates.io has no mesh-llm-plugin past 0.78.1, so the pin stays a git rev (#52). The stand-in hosts in tests/ fill the fields protocol 3 gained since (settings_json, invocation_id) as a host without them sends them: empty. Signed-off-by: kleinbem --- CHANGELOG.md | 2 ++ crates/evidence-plugin/Cargo.lock | 34 ++++++++++--------- crates/evidence-plugin/Cargo.toml | 11 +++--- .../tests/admission_interop.rs | 2 ++ .../tests/commitment_interop.rs | 2 ++ crates/evidence-plugin/tests/interop.rs | 1 + .../tests/ledger_fetch_bridge_interop.rs | 2 ++ .../tests/mesh_evidence_bridge_interop.rs | 2 ++ plugin.toml | 3 +- 9 files changed, 37 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 194b195e..c7d28b53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ **There is no downgrade from this build.** A node that has run it cannot go back to 0.1.19 or earlier: the older plugin reads the new checkpoint `sub` as a failed COSE check (`failed to load checkpoint state ... the checkpoint's COSE does not verify: CWT subject ...`), and because `capsules` is a required plugin the whole node stops. Before upgrading, stop the node and copy the whole data directory (by default `~/.local/share/capsules`); that copy is the only way back. `keys/` holds the node's private keys: keep that copy as private as the keys themselves, and never attach it to an issue or share it. `capsules export-flat` does not change this: it copies the checkpoints as they are, and an earlier plugin refuses the new ones (#308). +- **mesh-llm-plugin is taken from the mesh-llm v0.80.0 release commit, so a build uses the `PROTOC` it is given (Mesh-LLM/mesh-llm#2448).** The commit pinned before predates that change, and its build script always ran its bundled protoc. Still plugin protocol 3. crates.io has no mesh-llm-plugin past 0.78.1 yet, so the git pin stays (#52). + ### Added - **The ledger carries a format marker, and a build refuses a ledger written in a newer format (#308).** The plugin writes `ledger/format` (this release writes `1`, the checkpointed-local-log 0.6 stack) when it opens the ledger. A build that meets a higher number stops at start (the node does not start, since `capsules` is a required plugin) with `this ledger was written by a newer plugin (ledger format N, this build reads up to M); downgrade is not supported`, and leaves the ledger as it was, instead of failing in the checkpoint check. Builds before this one do not read the marker, so it does not make a rollback to them safe: back the data directory up before upgrading (the checkpointed-local-log 0.6 entry under Changed says how). Nothing a peer reads changes. diff --git a/crates/evidence-plugin/Cargo.lock b/crates/evidence-plugin/Cargo.lock index 3b387bd1..bfac9c6a 100644 --- a/crates/evidence-plugin/Cargo.lock +++ b/crates/evidence-plugin/Cargo.lock @@ -1560,14 +1560,16 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "mesh-llm-config" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "anyhow", "dirs", + "libc", "mesh-llm-types", "semver", "serde", + "serde_json", "skippy-native-runtime", "skippy-protocol", "toml 1.1.6+spec-1.1.0", @@ -1578,8 +1580,8 @@ dependencies = [ [[package]] name = "mesh-llm-plugin" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "anyhow", "async-trait", @@ -1596,8 +1598,8 @@ dependencies = [ [[package]] name = "mesh-llm-types" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "hex", "serde", @@ -2561,8 +2563,8 @@ checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "skippy-model-artifact" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "anyhow", "async-trait", @@ -2573,16 +2575,16 @@ dependencies = [ [[package]] name = "skippy-model-ref" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "serde", ] [[package]] name = "skippy-native-runtime" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "anyhow", "hex", @@ -2593,8 +2595,8 @@ dependencies = [ [[package]] name = "skippy-protocol" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "prost", "prost-build", @@ -2605,8 +2607,8 @@ dependencies = [ [[package]] name = "skippy-tokenizer" -version = "0.78.0" -source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=a39211e78f3dd73cf9a94b08417c0da17e5fa5d9#a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" +version = "0.80.0" +source = "git+https://github.com/Mesh-LLM/mesh-llm?rev=2b9e64aecdcebaa4242d0718e257bbd59cbf2575#2b9e64aecdcebaa4242d0718e257bbd59cbf2575" dependencies = [ "serde", ] diff --git a/crates/evidence-plugin/Cargo.toml b/crates/evidence-plugin/Cargo.toml index 84827435..fbe79c67 100644 --- a/crates/evidence-plugin/Cargo.toml +++ b/crates/evidence-plugin/Cargo.toml @@ -102,7 +102,7 @@ mutant-referee-hold-skips-asked-check = [] mutant-referee-ignores-split-margin = [] [dependencies] -mesh-llm-plugin = "0.78" +mesh-llm-plugin = "0.80" tokio = { version = "1", features = ["full"] } # The ledger's re-entrant append turn (`capsule_emit::CapsuleState`): std's # `ReentrantLock` is not stable. Already in the tree through tokio and others. @@ -265,8 +265,9 @@ strip = true opt-level = 3 # `PluginContext::announce_plugin_key` (host capability `plugin_keys.v1`, -# mesh-llm #2299) is on mesh-llm main but in no published mesh-llm-plugin yet: -# 0.78.1 predates it. Taken from the commit the hosts run until a release -# carries it; then this goes and the requirement above moves to that release. +# mesh-llm #2299) is in mesh-llm 0.79.0 and later, but crates.io has no +# mesh-llm-plugin past 0.78.1. Taken from the v0.80.0 release commit until a +# published mesh-llm-plugin carries it; then this goes and the requirement +# above moves to that release. [patch.crates-io] -mesh-llm-plugin = { git = "https://github.com/Mesh-LLM/mesh-llm", rev = "a39211e78f3dd73cf9a94b08417c0da17e5fa5d9" } +mesh-llm-plugin = { git = "https://github.com/Mesh-LLM/mesh-llm", rev = "2b9e64aecdcebaa4242d0718e257bbd59cbf2575" } diff --git a/crates/evidence-plugin/tests/admission_interop.rs b/crates/evidence-plugin/tests/admission_interop.rs index d8b126a7..adb04023 100644 --- a/crates/evidence-plugin/tests/admission_interop.rs +++ b/crates/evidence-plugin/tests/admission_interop.rs @@ -108,6 +108,7 @@ impl Host { host_version: "admission-interop".to_string(), host_info_json: "{}".to_string(), mesh_visibility: proto::MeshVisibility::Private as i32, + settings_json: String::new(), })) .await; match self.answer(id).await { @@ -133,6 +134,7 @@ impl Host { kind: proto::ServiceKind::OpenaiExchange as i32, service_name: handler.to_string(), input_json: event.to_string(), + invocation_id: None, })) .await; match self.answer(id).await { diff --git a/crates/evidence-plugin/tests/commitment_interop.rs b/crates/evidence-plugin/tests/commitment_interop.rs index 4785415e..36d768b8 100644 --- a/crates/evidence-plugin/tests/commitment_interop.rs +++ b/crates/evidence-plugin/tests/commitment_interop.rs @@ -120,6 +120,7 @@ impl Harness { host_version: "commitment-interop-test".to_string(), host_info_json: "{}".to_string(), mesh_visibility: proto::MeshVisibility::Private as i32, + settings_json: String::new(), })) .await; let envelope = self.recv().await; @@ -215,6 +216,7 @@ impl Harness { .send(Payload::RpcRequest(proto::RpcRequest { method: "tools/call".to_string(), params_json: json!({"name": name, "arguments": arguments}).to_string(), + invocation_id: None, })) .await; if let Some((channel, endpoint)) = mesh { diff --git a/crates/evidence-plugin/tests/interop.rs b/crates/evidence-plugin/tests/interop.rs index 0436fa9f..1c34b3ac 100644 --- a/crates/evidence-plugin/tests/interop.rs +++ b/crates/evidence-plugin/tests/interop.rs @@ -113,6 +113,7 @@ impl Harness { host_version: "interop-test".to_string(), host_info_json: "{}".to_string(), mesh_visibility: proto::MeshVisibility::Private as i32, + settings_json: String::new(), })) .await; let envelope = self.recv().await; diff --git a/crates/evidence-plugin/tests/ledger_fetch_bridge_interop.rs b/crates/evidence-plugin/tests/ledger_fetch_bridge_interop.rs index 11597c83..58107738 100644 --- a/crates/evidence-plugin/tests/ledger_fetch_bridge_interop.rs +++ b/crates/evidence-plugin/tests/ledger_fetch_bridge_interop.rs @@ -115,6 +115,7 @@ impl Harness { host_version: "ledger-fetch-interop-test".to_string(), host_info_json: "{}".to_string(), mesh_visibility: proto::MeshVisibility::Private as i32, + settings_json: String::new(), })) .await; let envelope = self.recv().await; @@ -224,6 +225,7 @@ impl Harness { .send(Payload::RpcRequest(proto::RpcRequest { method: "tools/call".to_string(), params_json, + invocation_id: None, })) .await; diff --git a/crates/evidence-plugin/tests/mesh_evidence_bridge_interop.rs b/crates/evidence-plugin/tests/mesh_evidence_bridge_interop.rs index 5ef2eacf..e61169fe 100644 --- a/crates/evidence-plugin/tests/mesh_evidence_bridge_interop.rs +++ b/crates/evidence-plugin/tests/mesh_evidence_bridge_interop.rs @@ -139,6 +139,7 @@ impl Harness { host_version: "mesh-evidence-interop-test".to_string(), host_info_json: "{}".to_string(), mesh_visibility: proto::MeshVisibility::Private as i32, + settings_json: String::new(), })) .await; let envelope = self.recv().await; @@ -219,6 +220,7 @@ impl Harness { .send(Payload::RpcRequest(proto::RpcRequest { method: "tools/call".to_string(), params_json, + invocation_id: None, })) .await; diff --git a/plugin.toml b/plugin.toml index cdca37bd..5b968768 100644 --- a/plugin.toml +++ b/plugin.toml @@ -3,6 +3,7 @@ version = "0.1.19" # The oldest MeshLLM host this release works with (inclusive), as MAJOR.MINOR.PATCH. The # host retains it with the install and judges a host upgrade against it (mesh-llm#2971, # #2978). 0.78.0 is the first host with the events and plugin APIs the README lists as "in -# 0.78.0", and the plugin builds on mesh-llm-plugin 0.78. No max_host_version: none is known. +# 0.78.0", and the plugin builds on mesh-llm-plugin 0.80, still protocol 3. No max_host_version: +# none is known. # Checked by scripts/check-plugin-toml.sh, which package.sh runs. min_host_version = "0.78.0"